Sync for 0.13.

svn path=/trunk/; revision=12408

30 files changed, 97713 insertions, 53539 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 4ec52264f1..5b1e1af489 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-22  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-08-22  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
 2001-08-22  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian (bokmЕl) translation.
diff --git a/po/az.po b/po/az.po
index 276152b553..73601538a6 100644
--- a/po/az.po
+++ b/po/az.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Vasif Ismailoglu MD <azerb_linux@hotmail.com>, 2001.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.3.1\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -24,11 +25,11 @@ msgstr "'GnomeCard' fayllarд╠nд╠ 'Evolution' iц╖inи≥ gи≥tirи≥n e'malatxana."
 msgid "Imports VCard files into Evolution."
 msgstr "'GnomeCard' fayllarд╠nд╠ 'Evolution' iц╖inи≥ gи≥tirir."
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Kart: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -36,7 +37,7 @@ msgstr ""
 "\n"
 "Ad: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -44,7 +45,7 @@ msgstr ""
 "\n"
 "  Prefiks:\t"
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -52,7 +53,7 @@ msgstr ""
 "\n"
 "  Verilи≥n:\t"
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -60,7 +61,7 @@ msgstr ""
 "\n"
 "  ф▐lavи≥: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -68,7 +69,7 @@ msgstr ""
 "\n"
 "  Ailи≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -76,7 +77,7 @@ msgstr ""
 "\n"
 "  Suffiks:\t"
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -84,7 +85,7 @@ msgstr ""
 "\n"
 "Ad gц╪nц╪:  "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -92,7 +93,7 @@ msgstr ""
 "\n"
 "ц°nvan:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -100,7 +101,7 @@ msgstr ""
 "\n"
 "   Poц╖t Qutusu:\t"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -108,7 +109,7 @@ msgstr ""
 "\n"
 "   ф▐lavи≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -116,7 +117,7 @@ msgstr ""
 "\n"
 "   Kц╪ц╖и≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -124,7 +125,7 @@ msgstr ""
 "\n"
 "   е·и≥hи≥r:\t"
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -132,7 +133,7 @@ msgstr ""
 "\n"
 "   Rayon:\t"
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -140,7 +141,7 @@ msgstr ""
 "\n"
 "   Poц╖t Kodu:\t"
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -148,7 +149,7 @@ msgstr ""
 "\n"
 "   ц√lkи≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -156,7 +157,7 @@ msgstr ""
 "\n"
 "Tи≥slim Etiketi:  "
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -164,7 +165,7 @@ msgstr ""
 "\n"
 "Telefonlar:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -172,7 +173,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -180,7 +181,7 @@ msgstr ""
 "\n"
 "ePoц╖t:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -188,7 +189,7 @@ msgstr ""
 "\n"
 "ePoц╖t:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -196,7 +197,7 @@ msgstr ""
 "\n"
 "Gц╤ndи≥rici:  "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -204,7 +205,7 @@ msgstr ""
 "\n"
 "Zaman zolaд÷д╠:  "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -212,7 +213,7 @@ msgstr ""
 "\n"
 "Coд÷rafi Yerlи≥е÷mи≥:  "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -220,7 +221,7 @@ msgstr ""
 "\n"
 "Mи≥slи≥k:\t"
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -228,7 +229,7 @@ msgstr ""
 "\n"
 "Quruluе÷:\t"
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -236,7 +237,7 @@ msgstr ""
 "\n"
 "   Ad:\t"
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -244,7 +245,7 @@ msgstr ""
 "\n"
 "   Bц╤lmи≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -252,7 +253,7 @@ msgstr ""
 "\n"
 "   Bц╤lmи≥2:\t"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -260,7 +261,7 @@ msgstr ""
 "\n"
 "   Bц╤lmи≥3:\t"
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -268,7 +269,7 @@ msgstr ""
 "\n"
 "   Bц╤lmи≥4:\t"
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -276,7 +277,7 @@ msgstr ""
 "\n"
 "Kateqoriyalar:\t"
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -294,7 +295,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -302,7 +303,7 @@ msgstr ""
 "\n"
 "Yeganи≥ Kи≥limи≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -324,8 +325,8 @@ msgstr "%s ц╪ц╖ц╪n parol girin"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -340,20 +341,20 @@ msgstr "Ox yц╪klи≥nи≥ bilmи≥di\n"
 msgid "EBook not loaded\n"
 msgstr "eKitab yц╪klи≥nmи≥di\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot ц°nvan и≥lavи≥lи≥ri bloku oxuna bilmи≥di"
 
@@ -401,203 +402,213 @@ msgstr "'Evolution'un ц°nvan Dи≥ftи≥ri e'malatxanasд╠."
 msgid "Factory for the sample Addressbook control"
 msgstr "Nц╪munи≥vi ц╪nvan dи≥ftи≥ri idarи≥si e'malatxanasд╠"
 
-#: addressbook/gui/component/addressbook-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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "_ф▐laqи≥"
 
-#: 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-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Sц╪zgи≥c mи≥'lumatд╠nд╠ yц╪klи≥mи≥ xи≥tasд╠:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Namи≥'lum tanд╠tma nц╤vц╪"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Yeni и≥laqи≥"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "ф▐sas"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Yeni и≥laqи≥"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Bir"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Yeni и≥laqи≥"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Alt Aд÷ac"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Yeni и≥laqи≥"
 
-#: 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:144
+msgid "Edit Addressbook"
+msgstr "ц°nvan dи≥ftи≥rini dц╪zи≥lt"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Cild DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIZME DN Kц╤mи≥k Mи≥tnini bura cala"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Hesab"
 
-#. 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.glade.h:3
+msgid "Add Addressbook"
+msgstr "ц°nvan dи≥ftи≥ri и≥lavи≥ et"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "Ev Sahibi:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "ц°nvan Dи≥ftи≥ri Qaynaд÷д╠"
 
-#: 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.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "ф▐traflд╠..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Kц╤k DN :"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "ф▐sas"
 
-#: 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.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "ф▐sas"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Qapд╠:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "Sil"
 
-#: 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.glade.h:9
+msgid "One"
+msgstr "Bir"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 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.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Axtarд╠е÷ Hи≥rи≥kи≥ti ..."
 
-#: 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.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "Ad Seц╖"
 
-#: 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.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Baz."
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "ц°nvan dи≥ftи≥rini dц╪zи≥lt"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "ц°nvan dи≥ftи≥ri и≥lavи≥ et"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"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.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: 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:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "ц°nvan Dи≥ftи≥ri Qaynaд÷д╠"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "Hesab д╟darи≥si"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Dц╪zи≥lt"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Verici tanд╠tmaya ehtiyac hiss edи≥r"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Qapд╠:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Verici д╟smarд╠cд╠:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 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:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "%s ц╪ц╖ц╪n %s parol kalimanizi lц╪rfи≥n girin"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Tanд╠tma"
+
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "ePoц╖t ц°nvanд╠: "
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Parol"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "ц°nvan dи≥ftи≥rini aц╖a bilmи≥dim"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -605,48 +616,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Daxil edи≥n hи≥r hansд╠ ц╪zv"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Ad daxil edи≥n"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "ePoц╖t daxil edи≥n"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "Ad daxil edи≥n"
+msgid "Category is"
+msgstr "Kateqoriyalar"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "ф▐traflд╠..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Kateqoriyalar:"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "Qovluq Sи≥yyahд╠nд╠ gц╤stи≥rи≥cи≥k olan URI"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "( Adsд╠zdд╠r )"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "3.ncц╪ ePoц╖t ц╪nvanд╠"
 
@@ -670,19 +706,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "ц°nvan dи≥ftи≥rini dц╪zи≥lt"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 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-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "ф▐laqи≥lи≥rи≥ ф▐lavи≥ Et"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "ePoц╖t ц°nvanд╠: "
@@ -704,13 +740,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Sil"
 
@@ -723,37 +756,56 @@ msgstr "Hamд╠sд╠nд╠ Sil"
 msgid "Send HTML Mail?"
 msgstr "E-poц╖t Gц╤ndи≥rilir"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Digи≥r ф▐laqи≥lи≥r"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Alд╠cд╠lar Siyahд╠sд╠ :"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "daxil edir"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Ad Seц╖"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "_ф▐laqи≥"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "Adд╠ buradan seц╖:"
+msgid "F_ind"
+msgstr "Axtar"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "Ad Seц╖"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, 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/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "_Qovluq"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Alд╠cд╠lar Siyahд╠sд╠ :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -768,8 +820,8 @@ msgid "Business _Fax"
 msgstr "Mи≥slи≥ki _Faks"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Nц╤_vlи≥r..."
 
@@ -778,16 +830,16 @@ msgid "Contact Editor"
 msgstr "ф▐laqи≥ dц╪zи≥ldicisi"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "ф▐traflд╠"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Fи≥rqli fayllalи≥:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "ц°mumi"
 
@@ -812,239 +864,1240 @@ msgstr "Telefon Nц╤vlи≥ri"
 msgid "Wants to receive _HTML mail"
 msgstr "_HTML ePoц╖tlarд╠nд╠ qи≥bul edir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Web sи≥hifи≥si :"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_ц°nvan..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "_Kц╤mи≥kц╖i adд╠ :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_Ad gц╪nц╪ :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Mи≥slи≥k"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_ф▐laqи≥lи≥r ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Sil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Bц╤lmи≥ :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Tam Ad ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Ev"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "Mи≥slи≥k _izahд╠:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "_д╟darи≥cinin Adд╠ :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Cib"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Lи≥qи≥b :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_д╟darи≥ :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Mи≥slи≥k :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_Yoldaе÷:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_Bu ePoц╖t ц╪nvanд╠dд╠r"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Web sи≥hifи≥si :"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Bu ц╪zv bu kateqoriyalara aitdir:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Kц╤mи≥kц╖i"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Mи≥slи≥k"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "2.nci Mи≥slи≥k"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Mи≥slи≥ki Faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Geri axtarma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Maе÷д╠n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "е·irkи≥t"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "2.nci ev"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Ev faksд╠"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Cib telefonu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Baе÷qa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Baе÷qa faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Peycer"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "д╟lk"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "`%s' Qovluq mц╪ndи≥ricat faylд╠ silinи≥ bilmir: %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Cи≥ld ф▐laqи≥ ф▐lavи≥si"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Hamд╠sд╠nд╠ Dц╪zи≥lt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Tam Ad"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "ePoц╖t"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "ц°nvan _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Kц╤mи≥kц╖i"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Avtomatik"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "д╟stiqamи≥t"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "Avqust"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "il"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Bц╤yц╪klц╪k"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Gц╤ndи≥rilir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "ePoц╖t"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Stul"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "ц°nvanд╠ Yoxla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Fayl"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Stul"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Rи≥nglи≥r"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Kц╤ц╖ц╪rdц╪lц╪r"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "ц√l_kи≥:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "ABе·"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Lи≥д÷v Edildi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "hи≥ftи≥"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finlandiya"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "ц°mumi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "ePoц╖t"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "saat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Bazar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "ф▐n Alц╖aq"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "ф▐n Alц╖aq"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "Aprel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Mart"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "ePoц╖t"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "ePoц╖t"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "ePoц╖t"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Kи≥narlar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "May"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Bazar ertи≥si"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Cib telefonu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "д╟darи≥ci"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Yeni Mи≥ktub"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "д╟l_gи≥yi Seц╖"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Yeni и≥laqи≥"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Yeni Mи≥ktub"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Yц╪ksи≥k"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "Aprel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "dи≥qiqи≥"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "д╟ndi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Yapд╠е÷dд╠r"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Kaд÷д╠z"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finlandiya"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Portret"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "sonra"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Bц╤lmи≥lи≥r :"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Xal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "ц°mumi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr ""
+"Vaxt\n"
+"Planlaе÷dд╠r"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Gц╤ndи≥r"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Baz"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Lи≥qи≥b"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finlandiya"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Gц╤rц╪lmц╪е÷"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Radio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Vи≥zifи≥"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finlandiya"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Gn:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Bugц╪n"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "ц┤.a"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Zibil Qutusu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "ц┤oxlu д╟smarд╠c"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Ad Seц╖"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Gц╤rц╪lmц╪е÷"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_ц°nvan :"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_е·и≥hи≥r:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Poц╖t Qutusu:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Vilayи≥t"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_ZIP Kodu:"
 
@@ -1135,6 +2188,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Sil"
@@ -1145,7 +2199,7 @@ msgid "contact-list-editor"
 msgstr "ф▐laqи≥ dц╪zи≥ldicisi"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "ф▐laqи≥ dц╪zи≥ldicisi"
@@ -1155,7 +2209,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1177,25 +2231,31 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "Digи≥r ф▐laqи≥lи≥r"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Digи≥r ф▐laqи≥lи≥r"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "ф▐traflд╠ Axtarд╠е÷"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Axtar"
 
@@ -1307,42 +2367,52 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: 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-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Aц╖"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Fи≥rqli ц┤atdд╠r"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "ф▐laqи≥yи≥ yeni bir ismarд╠c gц╤ndи≥r"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "ц┤ap Et"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "Zи≥rfi ц┤ap Et"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Sil"
 
@@ -1359,7 +2429,8 @@ 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
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Namи≥'lum xи≥ta"
 
@@ -1368,7 +2439,7 @@ msgstr "Namи≥'lum xи≥ta"
 msgid "Repository offline"
 msgstr "Xи≥tdи≥n Qopuq д╟е÷lи≥"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Qadaд÷andд╠r"
 
@@ -1387,8 +2458,11 @@ msgid "Protocol not supported"
 msgstr "ф▐mи≥liyyat dи≥stи≥klи≥nmir"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "Lи≥д÷v Edildi"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1417,135 +2491,135 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
 " Data oxunarkи≥n xи≥ta oldu:\n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* ф▐laqи≥ и≥lavи≥ etmи≥k ц╪ц╖ц╪n buraya tд╠qlayд╠n *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Fи≥rqli faylla"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "ePoц╖t"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "ф▐sas Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Kц╤mи≥kц╖i Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "д╟е÷ Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "Geri axtarma Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "е·irkи≥t Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "е·irkи≥t"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "д╟е÷ ц°nvanд╠"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Ev ц°nvanд╠"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "ф▐l Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Maе÷д╠n Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "2.nci д╟е÷ Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "2.nci Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Digи≥r Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Baе÷qaц°nvanlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Web Sи≥hifи≥si"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Bц╤lmи≥"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "д╟darи≥"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Baе÷lд╠q"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Mи≥slи≥k"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "д╟darи≥ci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Lи≥qи≥b"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Yoldaе÷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Qeyd"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "Sи≥rbи≥st/mи≥е÷д÷ul URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Qurtardд╠"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "Tи≥qvim yц╪klи≥nir..."
@@ -1742,6 +2816,23 @@ msgstr "En :"
 msgid "_Font..."
 msgstr "Yazд╠ nц╤vц╪ ..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Tи≥qvimi ц╖ap et"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Tи≥qvimi ц╖ap et"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Zи≥rfi ц┤ap Et"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1900,7 +2991,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "GNOME baе÷ladд╠la bilmи≥di"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Bonoboyu baе÷lada bilmи≥dim"
@@ -1909,151 +3000,142 @@ msgstr "Bonoboyu baе÷lada bilmи≥dim"
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermи≥ xidmи≥ti e'malatxanasд╠ yaradд╠la bilmir"
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:586
+#: calendar/gui/calendar-commands.c:604
 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."
+"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:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "ц°mumi"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Gizli"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "ц°mumi"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "Baz."
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "ц┤и≥rе÷."
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Yц╪ksи≥k"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Alц╖aq"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "hи≥ftи≥"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Mи≥е÷д÷ul"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Baе÷lamayд╠b"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "д╟е÷lи≥yir"
 
-#: 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Bitirmи≥ Tarixi"
 
-#: 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:893 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2064,28 +3146,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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: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:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2095,45 +3156,49 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 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:1168
+#: calendar/gui/calendar-model.c:1092
 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:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Tи≥svirsiz"
 
-#: 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."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Yoxdur"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Tи≥krarlayan"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "Vи≥zifи≥lи≥ndirilmiе÷"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Bи≥li"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Xeyr"
 
@@ -2157,30 +3222,87 @@ msgstr "Gц╤rц╪nц╪е÷lи≥ri Mц╪и≥yyи≥nlи≥е÷dir"
 msgid "Month View"
 msgstr "Ay"
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "Xц╪lasи≥ daxil edи≥n"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "д╟zah :"
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "е·и≥rh daxil edи≥n"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Tи≥qvim"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Vи≥zifи≥"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Mи≥ktublaе÷ma Qrupundakд╠ VFolder"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Yeni bir iclas yarat"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Yeni д╟clas"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Yeni bir vи≥zifи≥ yarat"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Yeni Vи≥zifи≥"
+
 #: 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/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Sи≥sli Alarmlar"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Alд╠cд╠lar Siyahд╠sд╠ :"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Gц╤stи≥rmи≥ Seц╖и≥nи≥klи≥ri :"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2232,121 +3354,127 @@ msgstr "saat"
 msgid "minutes"
 msgstr "dи≥qiqи≥"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "%d gц╪n"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr "1 gц╪n"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "%d hи≥ftи≥"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr "2 hи≥ftи≥"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "%d saat"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr "1 saat"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "%d dи≥qiqи≥"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr "1 dи≥qiqи≥"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "%d saniyи≥"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr "1 saniyи≥"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Proqramд╠ iе÷и≥ sal"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Namи≥'lum"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "iclasд╠n baе÷lanд÷д╠cд╠ndan и≥vvи≥l"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "iclasд╠n baе÷lanд÷д╠cд╠ndan sonra"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "iclas qurtarandan и≥vvи≥l"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Mц╪ndи≥ricat:"
 
@@ -2355,12 +3483,11 @@ msgstr "Mц╪ndи≥ricat:"
 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
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "sonra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "и≥vvи≥l"
 
@@ -2377,7 +3504,7 @@ msgstr "gц╤rц╪е÷ц╪n sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "dи≥qiqи≥"
 
@@ -2394,204 +3521,230 @@ msgid "10 minutes"
 msgstr "10 dи≥qiqи≥"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 saat (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 dи≥qiqи≥"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 saat"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 dи≥qiqи≥"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 dи≥qiqи≥"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "_Mи≥ktub Qurд÷ularд╠..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Alarm pи≥ncи≥rи≥si ц╖д╠xanda biiplи≥."
+msgid "Color for tasks due today"
+msgstr ""
 
 #: 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"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Yeni bir iclas yarat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "Tи≥qvim Seц╖и≥nи≥klи≥ri"
+#, fuzzy
+msgid "Days"
+msgstr "Gц╪n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Hи≥ftи≥nin ilk gц╪nц╪:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "Cц╪mи≥"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+#, fuzzy
+msgid "Hours"
+msgstr "saat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
-msgid "Compress weekends in month view"
-msgstr "Hи≥ftи≥ sonlarд╠nд╠ sд╠xд╠е÷dд╠r"
+msgid "Minutes"
+msgstr "dи≥qiqи≥"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "Tarix sи≥yyahд╠ xц╪susiyyи≥tlи≥ri"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Bazar ertи≥si"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "ф▐saslar"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Vaxtд╠ Keц╖miе÷ д╟е÷lи≥r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "Ekran"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "е·и≥nbи≥"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Gц╪n sonu:"
+#, 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:19
-msgid "First day of week:"
-msgstr "Hи≥ftи≥nin ilk gц╪nц╪:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Hи≥ftи≥ Sayд╠sд╠nд╠ gц╤stи≥r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Cц╪m"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "Gц╪bц╪b baе÷lanд÷д╠cд╠:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Cц╪mи≥"
+#, fuzzy
+msgid "Su_n"
+msgstr "Baz"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Bazar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "B.e"
+#, fuzzy
+msgid "T_hu"
+msgstr "C.a"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Bazar ertи≥si"
+#, fuzzy
+msgid "T_ue"
+msgstr "ц┤.a"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Bц╪gunki д╟е÷lи≥r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "Vaxtд╠ Keц╖miе÷ д╟е÷lи≥r"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Cц╪mи≥ Axе÷amд╠"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Bц╪tц╪n Gц╤rц╪е÷lи≥rimi Bildir"
+#, fuzzy
+msgid "Time"
+msgstr "Baе÷lд╠q"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"Zaman zolaд÷д╠:  "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "е·n"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Vaxt Dilimlи≥ri:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "е·и≥nbи≥"
+msgid "Time format:"
+msgstr "Vaxt е·и≥kli:"
 
 #: 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/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "ц┤и≥rе÷и≥nbи≥ axе÷amд╠"
 
 #: 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/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "ц┤и≥rе÷и≥nbи≥"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "Gц╪bц╪b baе÷lanд÷д╠cд╠:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "д╟_е÷  hи≥ftи≥si"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "Baz"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 saat (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Bazar"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 saat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "Vи≥zifи≥"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "Bц╪gunki д╟е÷lи≥r"
+msgid "_Compress weekends in month view"
+msgstr "Hи≥ftи≥ sonlarд╠nд╠ sд╠xд╠е÷dд╠r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "C.a"
+#, fuzzy
+msgid "_Display"
+msgstr "Ekran"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Cц╪mи≥ Axе÷amд╠"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Gц╪n sonu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "Baе÷lд╠q"
+msgid "_Fri"
+msgstr "Cц╪m"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Vaxt Dilimlи≥ri:"
+#, fuzzy
+msgid "_General"
+msgstr "ц°mumi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Vaxt е·и≥kli:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Silinи≥n д╟smarд╠clarд╠ Gizlи≥t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"Zaman zolaд÷д╠:  "
+msgid "_Mon"
+msgstr "B.e"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "ц┤.a"
+#, fuzzy
+msgid "_Other"
+msgstr "Baе÷qa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "ц┤и≥rе÷и≥nbи≥ axе÷amд╠"
+#, fuzzy
+msgid "_Sat"
+msgstr "е·n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "ц┤и≥r"
+#, fuzzy
+msgid "_Task List"
+msgstr "Vи≥zifи≥"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "ц┤и≥rе÷и≥nbи≥"
+#, fuzzy
+msgid "_Wed"
+msgstr "ц┤и≥r"
 
 #: 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:49
-msgid "minutes before they occur."
-msgstr "dи≥qiqи≥ и≥vvи≥lindи≥ onlar meydana ц╖д╠xд╠rlar."
+msgid "before the start of the appointment"
+msgstr "iclasд╠n baе÷lanд÷д╠cд╠ndan и≥vvи≥l"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2656,64 +3809,59 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Uyд÷un Tarix"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "д╟clasд╠ dц╪zи≥lt"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "д╟clas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Vи≥zifи≥ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal ц╪zvц╪ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 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
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 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
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2721,12 +3869,12 @@ 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Fи≥rqli Qeyd Et ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2772,44 +3920,35 @@ msgstr "Bu `%s' vи≥zifи≥sini hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 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/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Fayl seц╖"
+msgid "Addressbook..."
+msgstr "ц°nvan dи≥ftи≥ri и≥lavи≥ et"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "Bц╤lmи≥lи≥r :"
+msgid "Delegate To:"
+msgstr "Silinи≥n"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 #, fuzzy
-msgid "Time Zones"
-msgstr ""
-"\n"
-"Zaman zolaд÷д╠:  "
-
-#: 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 ""
+msgid "Enter Delegate"
+msgstr "Silinи≥n"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "д╟clas"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Xatд╠rladд╠cд╠"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Tи≥krarlama"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
@@ -2818,174 +3957,190 @@ msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
 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/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Mи≥е÷д÷ul"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Siniflи≥ndirmи≥lи≥r"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Gizli"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Tarix vи≥ Vaxt"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "hи≥ftи≥"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Xц╪_susi"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "ц°m_umi"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Gц╤stи≥r"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "Mц╪_ndи≥ricat:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_Gizli"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "_Sonlanma vaxtд╠:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "_Baе÷lama vaxt:"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "Qrup adд╠ :"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "Kaд÷д╠z qaynaд÷д╠ :"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "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
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Ehtiyatdakд╠ д╟е÷tirakц╖д╠lar"
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Giriе÷imli"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Silinи≥n"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "д╟е÷lи≥yir"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Lazд╠mi д╟е÷tirakц╖д╠lar"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Ehtiyatdakд╠ д╟е÷tirakц╖д╠lar"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Qeyri д╟е÷tirakц╖д╠lar"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Gц╤ndи≥rildi"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Sil..."
@@ -3028,19 +4183,18 @@ msgid "Role"
 msgstr "Rolu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Hal"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Nц╤v"
 
 #: 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ц╖д╠:"
@@ -3085,13 +4239,14 @@ msgstr "...da (dи≥)"
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 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:1
+#, fuzzy
+msgid "A_dd"
+msgstr "ф▐lavи≥ Et"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3102,26 +4257,33 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Tи≥kralama Qaydasд╠"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Bи≥sit Tи≥krarlama"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Xц╪susi tи≥krarlama"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Dц╪zи≥lts"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Tи≥krarlama yoxudr"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Bи≥sit Tи≥krarlama"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "ц╪ц╖ц╪n"
@@ -3163,166 +4325,162 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% _Qurtardд╠:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "Silinи≥n"
+msgid "Date Completed:"
+msgstr "Bitirmи≥ Tarixi:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "Yoxdur"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "Gediе÷at"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Vи≥zifи≥"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_ц°stц╪nlц╪k:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% _Qurtardд╠:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Hal:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "Gediе÷at"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Vи≥zifи≥lи≥ndirilmiе÷"
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "д╟zah :"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Baе÷la_ma Tarixi:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Gizli"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Bu tarixи≥ qи≥dи≥r :"
 
-#: calendar/gui/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
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "_Aц╖"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kи≥_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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kц╤ц╖ц╪rt"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Yapд╠е÷dд╠r"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "д╟е÷arи≥tlи≥mи≥ qurtadд╠"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Vи≥zifи≥ni sil"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "д╟е÷arи≥tlи≥mи≥ qurtadд╠"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Bu vи≥zifи≥ni sil"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 msgstr "Vи≥zifи≥ и≥lavи≥ etmи≥k ц╪ц╖ц╪n buraya tд╠qla"
 
-#: 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"
@@ -3356,23 +4514,23 @@ msgstr "ц┤oд÷rafi Yerlи≥е÷mи≥"
 msgid "Priority"
 msgstr "ц°stц╪nlц╪k"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Baе÷lama Tarixi"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Mц╪ndи≥ricat"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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"
@@ -3384,155 +4542,264 @@ msgstr "%02i dи≥qiqи≥ bц╤lmи≥lи≥ri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Yeni Bц╪tц╪n Gц╪n Hadisи≥lи≥ri"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "_Bugц╪nи≥ Get"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Tarixи≥ Get..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Bu д╟clasд╠ sil"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Bu hadisи≥nin daе÷д╠na bilmи≥sinи≥ imkan ver"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Bu Hadisи≥ni sil"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Bц╪tц╪n Hadisи≥lи≥ri Sil"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "_Bu ePoц╖t ц╪nvanд╠dд╠r"
+msgid "Meeting Information"
+msgstr "Arzuya Baд÷lд╠ Mи≥'lumatlar"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 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:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "д╟clas sonlanma saatд╠ :"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:633
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Bu ismarд╠c hazд╠rda mц╤vcuddur"
+msgid "Meeting Update Request"
+msgstr "Gц╤rц╪ д╟s_tи≥yi (FIXME)"
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "_Bu ePoц╖t ц╪nvanд╠dд╠r"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Fayl seц╖"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "д╟smarд╠cд╠ Dц╪zи≥lt"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Mи≥'lumat"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "Vи≥zifи≥ Taxtasд╠"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "sonra idi"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "Vи≥zifи≥ So_rд÷usu (FIXME)"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Cavab ver"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "Qovluq geri dц╤nц╪lmи≥z е÷и≥kildи≥ xи≥sarи≥t alд╠b."
+msgid "Task Cancellation"
+msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Tи≥qvim д╟smarд╠cд╠"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "д╟stи≥nи≥n Mи≥'lumatlar"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "д╟stи≥nи≥n Mи≥'lumatlar"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "Sи≥rbи≥st/mи≥е÷д÷ul URL"
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "Sи≥rbи≥st/mи≥е÷д÷ul URL"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "ф▐vvи≥lki д╟smarд╠c"
+
+#: calendar/gui/e-itip-control.c:940
 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
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Bitirmи≥ Tarixi:"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Tи≥qvim faylд╠nд╠ aц╖a bilmirи≥m!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% _Qurtardд╠:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Gц╤ndи≥rilmи≥ tarixi"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3570,44 +4837,27 @@ msgstr "bitiе÷ tarixi"
 msgid "date-start"
 msgstr "baе÷lama tarixi"
 
-#: 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:252
-msgid "Category:"
-msgstr "Kateqoriyalar:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, 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:415
+#: calendar/gui/e-tasks.c:361
 #, 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"
 
-#. 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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Yeni д╟clas ..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(dи≥) qovluq yarada bilmи≥dim"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(д╠) aц╖maд÷a yarayan yol dи≥stи≥klи≥nmir"
@@ -3633,43 +4883,43 @@ msgid "Go To Date"
 msgstr "Tarixи≥ Get"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "д╟yul"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "д╟yun"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Mart"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "May"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Noyabr"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Oktyabr"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "Gц╪nи≥ Get"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3825,12 +5075,6 @@ msgstr "Cц╪mи≥"
 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:1815
 #, fuzzy
@@ -3867,9 +5111,8 @@ msgid "Print Calendar"
 msgstr "Tи≥qvimi ц╖ap et"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "ц┤ap Etmи≥ nц╪mayiе÷i"
 
@@ -3882,7 +5125,7 @@ msgstr "Bu ц╪zvц╪ ц╖ap et"
 msgid "Print Setup"
 msgstr "ц┤ap Qurд÷ularд╠"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "Gц╤stи≥rilи≥cи≥k vи≥zifи≥lи≥r qovluд÷unun URIsi"
 
@@ -3891,8 +5134,7 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"\"Evolution\" tи≥qvim qovluд÷unda olan vи≥zifи≥lи≥ri yeni qovluqlara "
-"daе÷д╠dд╠."
+"\"Evolution\" tи≥qvim qovluд÷unda olan vи≥zifи≥lи≥ri yeni qovluqlara daе÷д╠dд╠."
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -3901,10 +5143,10 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"\"Evolution\" tи≥qvim qovluд÷unda olan vи≥zifи≥lи≥ri yeni qovluqlara "
-"daе÷д╠maд÷a cи≥hd etdi.\n"
-"Bи≥zi vи≥zifи≥lи≥r daе÷д╠na bilmи≥di. Ona gц╤rи≥ dи≥ bu и≥mи≥liyyat "
-"gи≥lи≥cи≥kdи≥ dи≥ aparд╠lmalд╠dд╠r."
+"\"Evolution\" tи≥qvim qovluд÷unda olan vи≥zifи≥lи≥ri yeni qovluqlara daе÷д╠maд÷a "
+"cи≥hd etdi.\n"
+"Bи≥zi vи≥zifи≥lи≥r daе÷д╠na bilmи≥di. Ona gц╤rи≥ dи≥ bu и≥mи≥liyyat gи≥lи≥cи≥kdи≥ dи≥ "
+"aparд╠lmalд╠dд╠r."
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
@@ -3912,8 +5154,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"`%s' tapд╠la bilmи≥di; tи≥qvim qovluд÷una heц╖ bir vи≥zifи≥ vи≥zifи≥lи≥r "
-"qovluд÷una daе÷д╠na bilmи≥yи≥cи≥k."
+"`%s' tapд╠la bilmи≥di; tи≥qvim qovluд÷una heц╖ bir vи≥zifи≥ vи≥zifи≥lи≥r qovluд÷una "
+"daе÷д╠na bilmи≥yи≥cи≥k."
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
@@ -3921,13 +5163,110 @@ msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
-"`%s' yц╪klи≥mи≥k ц╪ц╖ц╪n iе÷lи≥dilи≥cи≥n metod dи≥stи≥klи≥mir;  tи≥qvim "
-"qovluд÷una heц╖ bir vи≥zifи≥ vи≥zifи≥lи≥r qovluд÷una daе÷д╠na bilmи≥yи≥cи≥k."
+"`%s' yц╪klи≥mи≥k ц╪ц╖ц╪n iе÷lи≥dilи≥cи≥n metod dи≥stи≥klи≥mir;  tи≥qvim qovluд÷una heц╖ bir "
+"vи≥zifи≥ vи≥zifи≥lи≥r qovluд÷una daе÷д╠na bilmи≥yи≥cи≥k."
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "BBeц┤aц┤CaCе·"
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+#, fuzzy
+msgid "contains? expects 2 arguments"
+msgstr "Parametr vи≥ ya arqumentlи≥rdи≥ sintaksis xи≥tasд╠"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 е÷ifrlи≥mи≥ ilи≥ imza dи≥stи≥klи≥nmir"
@@ -3985,6 +5324,7 @@ msgid "Unable to process spool folder"
 msgstr "Nц╤vbи≥ faylд╠nд╠ iе÷lи≥dи≥ bilmirи≥m"
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) д╟smarд╠cд╠ alд╠nд╠r"
 
@@ -4021,7 +5361,7 @@ msgstr "Alд╠cд╠ sц╪zgи≥c xи≥tasд╠: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "д╟е÷и≥ salд╠cд╠ sц╪zgи≥c xи≥tasд╠: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "д╟е÷и≥ salд╠cд╠ sц╪zgи≥c axtarд╠е÷д╠ xи≥tasд╠: %s: %s"
@@ -4048,12 +5388,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(hamд╠sд╠nд╠ yoxla) tи≥k dц╪zgц╪n nи≥ticи≥ istи≥yir"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Namи≥'lum baе÷lд╠qda sorг╖u aparд╠lд╠r: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Cismdи≥ hц╤kmsц╪z yazд╠, kи≥limи≥ xaric"
 
@@ -4086,21 +5426,17 @@ msgstr "%s ц╪ц╖ц╪n qд╠fд╠l faylд╠nд╠ yarada bilmи≥dim: %s"
 #: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"%s dakд╠(dи≥ki) qд╠fд╠l fayllд╠nд╠n alд╠nmasд╠ mц╪ddи≥ti doldu. Yenidи≥n "
-"sд╠na."
+msgstr "%s dakд╠(dи≥ki) qд╠fд╠l fayllд╠nд╠n alд╠nmasд╠ mц╪ddи≥ti doldu. Yenidи≥n sд╠na."
 
 #: camel/camel-lock.c: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:108
 #, c-format
@@ -4171,13 +5507,13 @@ msgid "No plaintext to sign."
 msgstr "д╟mzalanacaq dц╪z mи≥tn yoxdur."
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Parol verilmи≥yib."
 
 #: 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP proqramд╠na boru yaradд╠la bilmir. %s"
@@ -4195,15 +5531,15 @@ msgstr "Tи≥sdiqlи≥nи≥cи≥k dц╪z mи≥tn yoxdur."
 msgid "Couldn't create temp file: %s"
 msgstr "Mц╪vи≥qqи≥ti fayl yaradд╠la bilmir: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "е·ifrlи≥nи≥cи≥k mи≥tn yoxdur."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Alд╠cд╠ bildirilmи≥yib"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr "е·ifri aц╖д╠lacaq mи≥tn yoxdur."
 
@@ -4237,7 +5573,7 @@ msgid "Connection cancelled"
 msgstr "Baд÷lantд╠ Lи≥д÷v edildi"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s a(и≥) baд÷lana bilmirи≥m (qapд╠ %d): %s"
@@ -4248,7 +5584,7 @@ msgstr "(namи≥'lum ev sahibi)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "ф▐mи≥liyyat lи≥д÷v edildi"
 
@@ -4262,8 +5598,7 @@ 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."
@@ -4305,8 +5640,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Bu seц╖и≥nи≥k ,и≥gи≥r dи≥stи≥klи≥yirsи≥, verici ilи≥ CRAM-MD5 parolu ilи≥ "
-"ц╪nsiyyи≥t quracaqdд╠r."
+"Bu seц╖и≥nи≥k ,и≥gи≥r dи≥stи≥klи≥yirsи≥, verici ilи≥ CRAM-MD5 parolu ilи≥ ц╪nsiyyи≥t "
+"quracaqdд╠r."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -4317,8 +5652,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"Bu seц╖и≥nи≥k ,и≥gи≥r dи≥stи≥klи≥yirsи≥, verici ilи≥ DIGEST-MD5 parolu ilи≥ "
-"ц╪nsiyyи≥t quracaqdд╠r."
+"Bu seц╖и≥nи≥k ,и≥gи≥r dи≥stи≥klи≥yirsи≥, verici ilи≥ DIGEST-MD5 parolu ilи≥ ц╪nsiyyи≥t "
+"quracaqdд╠r."
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -4351,8 +5686,8 @@ msgstr "Kerberos 4"
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Bu seц╖и≥nи≥klи≥ siz vericisiyи≥ Kerberos 4 tanд╠dд╠lmasд╠ yolu ilи≥ "
-"baд÷lana bilи≥cи≥ksiniz."
+"Bu seц╖и≥nи≥klи≥ siz vericisiyи≥ Kerberos 4 tanд╠dд╠lmasд╠ yolu ilи≥ baд÷lana "
+"bilи≥cи≥ksiniz."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -4374,49 +5709,75 @@ 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."
 msgstr "Namи≥'lum tanд╠tma vи≥ziyyи≥ti."
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Parol"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Qaynaqlar"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Qaydalд╠ ifadи≥ dи≥rlanmи≥si bacarд╠lmadд╠: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLsi istifadи≥ц╖i adд╠na ehtiyac hiss edir"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLsi ev sahibinи≥ ehtiyac hiss edir"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLsi yola ehtiyac hiss edir"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "\"%s\" Hи≥ll edilir"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ad axtarд╠е÷д╠nda iflas etdim: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Qovе÷aq Ad axtarд╠е÷д╠ iflas etdi: %s: qovе÷aq tapд╠lmadд╠"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Qovе÷aq Ad axtarд╠е÷д╠ iflas etdi: %s: namи≥'lum sи≥bи≥b"
@@ -4427,15 +5788,14 @@ 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:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolu ц╪ц╖ц╪n xidmи≥tц╖i yoxdur"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4482,7 +5842,7 @@ msgstr "Bacarд╠lmayan д╟smarд╠c %d"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4490,7 +5850,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4543,61 +5903,61 @@ 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-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, 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:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP и≥mri iflas etdi: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "Verci cavabд╠ ц╖ox tez sonlandд╠."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, 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:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, 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:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluд÷unu yarada bilmи≥dim: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, 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:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "д╟smarд╠clar qeyd edilir"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "д╟smarд╠clar qeyd edilir"
@@ -4611,7 +5971,7 @@ msgstr "FETCH cavabд╠nda ismarд╠c gц╤vdи≥si tapд╠la bilmи≥di"
 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
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Yeni ePoц╖t ц╪ц╖ц╪n baxд╠lд╠r"
 
@@ -4619,7 +5979,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Qovluqlar"
 
@@ -4645,14 +6005,12 @@ 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."
 msgstr ""
-"Bu seц╖и≥nи≥klи≥ siz IMAP vericisinи≥ dц╪z mи≥tn parol ilи≥ baд÷lana "
-"bilи≥cи≥ksiniz."
+"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:463
 #, c-format
@@ -4660,7 +6018,7 @@ 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:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Tanд╠tma nц╤vц╪ dи≥ц÷tи≥klи≥nmir"
@@ -4671,7 +6029,7 @@ 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:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Parolu girmи≥diniz."
 
@@ -4686,12 +6044,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyи≥ bir qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4701,8 +6059,7 @@ msgstr "MH-е÷и≥klindи≥ mи≥ktub qovluqlarд╠"
 
 #: 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:50
 msgid "Standard Unix mailbox file"
@@ -4718,8 +6075,7 @@ msgstr "Qmail mи≥ktun qovluд÷u е÷и≥klindи≥ki mи≥ktub faylд╠"
 
 #: 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
@@ -4729,8 +6085,7 @@ 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"
+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
@@ -4786,7 +6141,7 @@ msgstr "д╟smarд╠c mи≥ktub qovluд÷u fayllд╠na и≥lavи≥ edilи≥ bilmir: %s: %s "
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4800,7 +6155,7 @@ msgstr ""
 "   %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4873,20 +6228,20 @@ msgstr "Mи≥ktub cи≥rgи≥si qovluд÷u cд╠д÷д╠rд╠ aц╖д╠la bilmir: %s: %s"
 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-mbox-folder.c:209
 #: 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"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "д╟smarд╠c mbox fayllд╠na и≥lava edilи≥ bimir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4898,12 +6253,12 @@ msgstr ""
 "д╟smarд╠c alд╠na bilmir: %s qovluд÷undan %s\n"
 "   %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: 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?"
@@ -4951,13 +6306,14 @@ msgstr "`%s' qovluд÷u boе÷ deyildir. Silinmи≥di."
 #. 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"
+#, fuzzy
+msgid "Summarizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing 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
@@ -4967,24 +6323,22 @@ 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"
+#, fuzzy, c-format
+msgid "Cannot summarize 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
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "Qovluq toplanmaq ц╪ц╖ц╪n aц╖д╠la bilmir: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5003,8 +6357,7 @@ msgstr "Mц╪vи≥qqи≥ti mи≥ktub qutusu aц╖д╠la bilmir: %s"
 #: 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и≥"
+"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
@@ -5090,6 +6443,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Qovluq yд╠д÷camlaе÷dд╠rд╠la bilmir: %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5155,8 +6519,8 @@ msgstr "USENET xи≥bи≥rlи≥ri"
 #: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
-"USENET xи≥bи≥r qruplarд╠na gц╤ndи≥rilmiе÷ hи≥r hansд╠ bir xи≥bи≥ri oxumaq "
-"ц╪ц╖ц╪n bir vasitи≥dir."
+"USENET xи≥bи≥r qruplarд╠na gц╤ndи≥rilmiе÷ hи≥r hansд╠ bir xи≥bи≥ri oxumaq ц╪ц╖ц╪n bir "
+"vasitи≥dir."
 
 #: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
@@ -5173,8 +6537,8 @@ msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
-"Bu seц╖и≥nи≥k NNTP verisici ilи≥ dц╪z mи≥tn е÷и≥klindи≥ki parol ilи≥ "
-"ц╪nsiyyи≥t quracaqdд╠r."
+"Bu seц╖и≥nи≥k NNTP verisici ilи≥ dц╪z mи≥tn е÷и≥klindи≥ki parol ilи≥ ц╪nsiyyи≥t "
+"quracaqdд╠r."
 
 #: camel/providers/nntp/camel-nntp-store.c:334
 #: camel/providers/nntp/camel-nntp-store.c:496
@@ -5182,39 +6546,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s ц╪ц╖ц╪n .newsrc faylд╠ aц╖д╠la bilmir ya da yaradд╠la bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "POP yд╠д÷camlaе÷dд╠rд╠lmasд╠ alд╠nд╠r"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP vericisindи≥ki yeni ismarд╠clar yoxlana bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Qovluq aц╖д╠la bilmir: ismarд╠c siyahд╠sд╠ bц╪tц╪n deyil."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "%s uid'li ismarд╠c yoxdur"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "%d POP ismarд╠cд╠ alд╠nд╠r"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "д╟smarд╠c alд╠na bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "%s POP vericisindи≥n ismarд╠clar alд╠na bilmи≥di: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "%s uid'li ismarд╠c yoxdur"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "%d POP ismarд╠cд╠ alд╠nд╠r"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "д╟smarд╠c saxlanmasд╠"
@@ -5228,7 +6592,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:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5237,17 +6601,17 @@ 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 vericilи≥rinи≥ baд÷lanmaq ц╪ц╖ц╪ndц╪r. POP protokolu eyni zamanda bи≥'zi "
-"veb mи≥ktub sistemlи≥rindи≥n mи≥ktub almaq ц╪ц╖ц╪n dи≥ iе÷lи≥dilи≥ bilir."
+"POP vericilи≥rinи≥ baд÷lanmaq ц╪ц╖ц╪ndц╪r. POP protokolu eyni zamanda bи≥'zi veb "
+"mи≥ktub sistemlи≥rindи≥n mи≥ktub almaq ц╪ц╖ц╪n dи≥ iе÷lи≥dilи≥ bilir."
 
 #: camel/providers/pop3/camel-pop3-provider.c: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 ""
-"Bu seц╖и≥nи≥k POP verisici ilи≥ dц╪z mи≥tn е÷и≥klindи≥ki parol ilи≥ "
-"ц╪nsiyyи≥t quracaqdд╠r.Bu bir ц╖ox mи≥ktub vericisi tи≥rи≥findи≥n "
-"dи≥stи≥klи≥nи≥n yeganи≥ seц╖и≥nи≥kdir."
+"Bu seц╖и≥nи≥k POP verisici ilи≥ dц╪z mи≥tn е÷и≥klindи≥ki parol ilи≥ ц╪nsiyyи≥t "
+"quracaqdд╠r.Bu bir ц╖ox mи≥ktub vericisi tи≥rи≥findи≥n dи≥stи≥klи≥nи≥n yeganи≥ "
+"seц╖и≥nи≥kdir."
 
 #: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
@@ -5255,16 +6619,15 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"Bu seц╖и≥nи≥k POP verisici ilи≥ APOP protokolu ilи≥ kodlanmд╠е÷ parol ilи≥ "
-"ц╪nsiyyи≥t quracaqdд╠r. Bu seц╖и≥nи≥k bц╪tц╪n vericilи≥r tи≥rи≥findи≥n "
-"bц╪tц╪n istifadи≥ц╖ilи≥r ц╪ц╖ц╪n dи≥stи≥klи≥nmи≥z."
+"Bu seц╖и≥nи≥k POP verisici ilи≥ APOP protokolu ilи≥ kodlanmд╠е÷ parol ilи≥ ц╪nsiyyи≥t "
+"quracaqdд╠r. Bu seц╖и≥nи≥k bц╪tц╪n vericilи≥r tи≥rи≥findи≥n bц╪tц╪n istifadи≥ц╖ilи≥r ц╪ц╖ц╪n "
+"dи≥stи≥klи≥nmи≥z."
 
 #: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
-"Bu seц╖и≥nи≥k POP verisici ilи≥ Kerberos 4 istifadи≥ edи≥rи≥k ц╪nsiyyи≥t "
-"quracaqdд╠r."
+"Bu seц╖и≥nи≥k POP verisici ilи≥ Kerberos 4 istifadи≥ edи≥rи≥k ц╪nsiyyи≥t quracaqdд╠r."
 
 #: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
@@ -5323,7 +6686,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:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5332,15 +6695,13 @@ msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
-"Yerli sistemdи≥ki \"sendmail\" proqramд╠ istifadи≥ edilи≥rи≥k mи≥ktub "
-"gц╤ndи≥rmи≥k ц╪ц╖ц╪n."
+"Yerli sistemdи≥ki \"sendmail\" proqramд╠ istifadи≥ edilи≥rи≥k mи≥ktub gц╤ndи≥rmи≥k "
+"ц╪ц╖ц╪n."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"Sendmailи≥ boru(pipe) ц╖и≥kilи≥ bilmи≥di bilmи≥di. %s: mи≥ktub "
-"gц╤ndи≥rilmи≥di"
+msgstr "Sendmailи≥ boru(pipe) ц╖и≥kilи≥ bilmи≥di bilmи≥di. %s: mи≥ktub gц╤ndи≥rilmи≥di"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
@@ -5355,8 +6716,7 @@ 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
@@ -5380,133 +6740,132 @@ 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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 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 ""
-"SMTP istifadи≥ edilи≥rи≥k uzaq mи≥ktub yayд╠cд╠sд╠na baд÷lanaraq mи≥ktub "
-"gц╤ndи≥rmи≥k ц╪ц╖ц╪n.\n"
+"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:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaksis xи≥tasд╠, и≥mr tanд╠nmд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametr vи≥ ya arqumentlи≥rdи≥ sintaksis xи≥tasд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "ф▐mr qи≥bul edilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "ф▐mr parametri qи≥bul edilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 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:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Kц╤mи≥k д╟smarд╠cд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Xidmи≥t hazд╠rdд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Xidmи≥t nи≥qliyyat kanallarд╠nд╠ baд÷layд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 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:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 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:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 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:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 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:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 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:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "Sorд÷ulanan gediе÷ lи≥д÷v edildi; xи≥ta oldu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 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:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 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:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 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:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 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:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 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:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Nи≥qliyyat bacarд╠lmadд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "Parol nи≥qli lazд╠mdд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "Tanд╠tma mexanizmasд╠ ц╖ox zи≥ifdir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 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:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Mц╪vи≥qqи≥ti tanд╠tma iflasд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Tanд╠tma lazд╠mdд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, 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:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5517,133 +6876,129 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, 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:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 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:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 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:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "д╟smarд╠c gц╤ndи≥rilir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 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:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, 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:744
-msgid "Error creating SASL authentication object."
-msgstr "SASL tanд╠tma cismi yaratma xи≥tasд╠."
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Tanд╠tma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr "SASL tanд╠tma cismi yaratma xи≥tasд╠."
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istи≥k vaxt dolmasд╠. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "AUTH istи≥k vaxt dolmasд╠. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 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:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, 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:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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"
+"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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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"
+"DATA cavablama xи≥tasд╠: ismarд╠c qurtarд╠lmasд╠: %s: mи≥ktub gц╤ndи≥rilи≥ bilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istи≥k vaxt dolmasд╠. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET cavablama xи≥tasд╠: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, 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:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUд╟T cavablama xи≥tasд╠: %s: aд÷д╠r deyil"
@@ -5673,7 +7028,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "yapд╠е÷dд╠rд╠lmд╠е÷ fayl"
 
@@ -5706,58 +7061,58 @@ msgstr "MIME nц╤vц╪:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "ц°nvan dи≥ftи≥ri ц╪ц╖ц╪n buraya tд╠qla"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Gц╤ndи≥rи≥n:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Mц╤vzu :"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "д╟smarд╠cд╠n gц╤ndи≥rildiд÷i adamlar"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "д╟smarд╠cд╠n nц╪sxи≥sinin gц╤ndи≥rilи≥cи≥yi ц╪nvanlar"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"д╟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 ."
+"д╟smarд╠cд╠n nц╪sxи≥lи≥rinin gц╤ndи≥rilи≥cи≥yi ц╪nvanlarд╠ bildir; bunlar ц╤zlи≥rini "
+"ismarд╠cд╠n gц╤ndи≥rildiд÷i adamlar arasд╠nda gц╤rmи≥yи≥cи≥kdir ."
 
 #: composer/e-msg-composer-select-file.c:228
 #: ui/evolution-message-composer.xml.h:2
@@ -5780,30 +7135,30 @@ msgid ""
 "%s"
 msgstr "Fayl yц╪klи≥rkи≥n xи≥ta oldu: %s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Fи≥rqli qeyd et ..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Xи≥bи≥rdarlд╠q"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fayl qeyd edи≥rkи≥n xи≥ta oldu: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fayl yц╪klи≥rkи≥n xи≥ta oldu: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5811,17 +7166,17 @@ msgstr ""
 "Bu hesab ц╪ц╖ц╪n lahiyи≥ cи≥rgи≥sи≥ aц╖д╠la bilmи≥di.\n"
 "ф▐sas lahiyи≥ cи≥rgи≥sini iе÷lи≥tmи≥k istи≥yirsiniz?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayl qeyd edи≥rkи≥n xи≥ta oldu: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, 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
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5830,7 +7185,7 @@ msgstr ""
 "Nи≥ticи≥ faylд╠ yaradд╠la bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5839,7 +7194,7 @@ msgstr ""
 "Nи≥ticи≥ faylд╠ yaradд╠la bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5848,16 +7203,16 @@ msgstr ""
 "д╟smarд╠clarд╠n buraya qeyd edilmи≥ xatasд╠: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 #, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution Pine mи≥ktub fayllarд╠ tapdд╠.\n"
 "Onlarд╠ proqramд╠mд╠za idxal edи≥k?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5867,25 +7222,25 @@ msgstr ""
 "\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
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Faylд╠ aц╖"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "_Mи≥tn faylд╠nд╠ daxil et ... "
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Bir ismarд╠c yaz"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Dialoq qutusunu yarada bilmи≥dim ."
 
@@ -5894,8 +7249,7 @@ msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
-"Yazд╠ц╖д╠ pи≥ncи≥rи≥sini yarada bilmirи≥m, ц╖ц╪nkц╪ siz mи≥ktub "
-"parц╖asд╠ndakд╠\n"
+"Yazд╠ц╖д╠ pи≥ncи≥rи≥sini yarada bilmirи≥m, ц╖ц╪nkц╪ siz mи≥ktub parц╖asд╠ndakд╠\n"
 "heц╖ bir qurг╖ulari, aparmamд╠sд╠nд╠z."
 
 #: composer/evolution-composer.c:374
@@ -5914,57 +7268,103 @@ msgstr "ц╪nvan kartд╠"
 msgid "calendar information"
 msgstr "tи≥qvim haqqд╠nda"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "daxil edir"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "daxil etmir"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "е·и≥rh daxil edи≥n"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Ad daxil edи≥n"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Alд╠cд╠lar"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Ad daxil edи≥n"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Ad daxil edи≥n"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "daxil etmir"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %m/%d/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5972,13 +7372,13 @@ 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:303
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -6076,7 +7476,7 @@ msgstr "indiki vaxta gц╤rи≥ mц╪ddи≥t"
 msgid "Compare against"
 msgstr "Mц╪qayisи≥ et"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "indi"
 
@@ -6088,11 +7488,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<vaxtд╠ gц╤rи≥ bilmи≥k ц╪ц╖ц╪n buraya tд╠qlayд╠n>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Sц╪zgи≥c Qaydalarд╠"
 
@@ -6111,23 +7515,22 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 "VAxsey, qovluq seц╖mи≥yi unutdunuz.\n"
-"Lц╪tfи≥n arxaya gedin vи≥ mи≥ktublarд╠n toplanacaд÷д╠ hц╤kmlц╪ bir qovluq "
-"seц╖in."
+"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:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Qovluq Seц╖in"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Qovluq URIsini Bildirin"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<qovluq seц╖mи≥k ц╪ц╖ц╪n buraya tд╠qlayд╠n>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6148,62 +7551,51 @@ msgstr "Qayda adд╠ :"
 msgid "Untitled"
 msgstr "Adsд╠z"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "ф▐gи≥r"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Gediе÷i iе÷и≥ sal"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "bц╪tц╪n kriteriyalar uyд÷un gи≥lirsи≥"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "и≥gи≥r hи≥r hansд╠ bir kriteriya uyд÷un gи≥lirsи≥"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Kriteriya и≥lavи≥ et"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "gи≥lи≥n"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Sц╪zgи≥clи≥ri Dц╪zи≥lt"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "VFolderlи≥ri Dц╪zи≥lt"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Gи≥lи≥n"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Gedи≥n"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtual Qovluqlar"
 
@@ -6227,194 +7619,195 @@ msgstr "bц╪tц╪n yerli vи≥ fи≥al uzaq qovluqlarla"
 msgid "with all local folders"
 msgstr "bц╪tц╪n yerli qovluqlarla"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Rи≥ngi Seц╖"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Qaynaд÷д╠ Seц╖"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ Fayllar"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "daxil edir"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Qovluд÷a Kц╤ц╖ц╪rt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Alд╠nma tarixi"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Gц╤ndи≥rilmи≥ tarixi"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Silinи≥n"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "daxil etmir"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ilи≥ sonlanmд╠r"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "yoxdur"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "oxц╖amд╠r"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "baе÷lamд╠r"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Mц╤vcud Deyildir"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Lahiyи≥"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "sonlanд╠r"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Mц╤vcuddur"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "mц╤vcuddur"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "д╟fadи≥"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Vacib"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "dir(dд╠r)"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "bц╤yц╪kdц╪r"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "azdд╠r"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "deyil"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Mи≥ktublaе÷ma qrupu"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "д╟smarд╠c Gц╤vdи≥si"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "д╟smarд╠c Baе÷lд╠д÷д╠"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "д╟smarд╠c alд╠ndд╠"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "д╟smarд╠c gц╤ndи≥rildi"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Qovluд÷a Kц╤ц╖ц╪r"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "da(dи≥) ya da sonra"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "da(dи≥) ya da и≥vvи≥l"
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Oxu"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Alд╠cд╠lar"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Regex Uyд÷unluqlarд╠"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Cavab verilи≥n"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Gц╤ndи≥rи≥n"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Hal Seц╖"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Bц╤yц╪klц╪k"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "oxе÷ayд╠r"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Mи≥nbи≥ Hesabд╠"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Xas baе÷lд╠q"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "baе÷layд╠r"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "д╟е÷i Dayandд╠r"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Mц╤vzu"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "daxil edir"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "daxil etmir"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "ilи≥ sonlanmд╠r"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "yoxdur"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "oxц╖amд╠r"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "baе÷lamд╠r"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "sonlanд╠r"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "mц╤vcuddur"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "bц╤yц╪kdц╪r"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "azdд╠r"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "deyil"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "dir(dд╠r)"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "da(dи≥) ya da sonra"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "da(dи≥) ya da и≥vvи≥l"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "oxе÷ayд╠r"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "baе÷layд╠r"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "sonra idi"
@@ -6444,14 +7837,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "ePoц╖t"
@@ -6483,12 +7875,12 @@ msgstr ""
 "Evolution Netscape  mи≥ktub fayllarд╠ tapdд╠.\n"
 "Onlarд╠ proqramд╠mд╠za idxal edи≥k?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "Qurд÷ular..."
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6545,169 +7937,190 @@ msgstr "Mи≥ktub Mц╪ndи≥ricatд╠ parц╖asд╠ e'malatxanasд╠."
 msgid "Mail configuration interface"
 msgstr "ePoц╖t Quraе÷dд╠rд╠lmasд╠"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Mи≥ktublaе÷ma Qrupundakд╠ VFolder"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "_Seц╖и≥nи≥klи≥r..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Fayllarд╠n seц╖и≥nи≥klи≥rini tи≥kmillи≥е÷dir"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "_Mи≥ktub д╟smarд╠cд╠"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "_Mи≥ktub д╟smarд╠cд╠"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionun ePoц╖t parц╖asд╠nд╠ baе÷lada bilmи≥dim ."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "Nц╪sxи≥ni qabд╠q ilи≥ qeyd edи≥ bilmи≥dim"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"in Seц╖и≥nи≥klи≥ri"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Seц╖и≥nи≥klи≥r"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "д╟smarд╠cdan Qayda _Yarat"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "_Mц╤vzudakд╠ vFolder"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "Gц╤n_dи≥rи≥ndи≥ki vFolder"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "_Alд╠cд╠dakд╠ vFolder"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "Mи≥ktublaе÷ma Q_rupundakд╠ VFolder"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Mц╤_vzudakд╠ Sц╪zgи≥c"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Gц╤n_dи≥rи≥ndи≥ki  Sц╪zgи≥c"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "_Alд╠cд╠dakд╠ Sц╪zgи≥c"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "_Mи≥ktublaе÷ma Qrupundakд╠ Sц╪zgи≥c"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "Yenidи≥n Gц╤ndи≥r"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "д╟smarд╠clarд╠ _Fи≥rqli Qeyd Et ..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Fи≥rqli _Qeyd Et ..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_ц┤ap Et"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Gц╤ndи≥rи≥nи≥ _Cavab Ver"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "_Hamд╠sд╠na Cavab Ver"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "_Hamд╠sд╠na Cavab Ver"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_ц┤atdд╠r"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Oxun_muе÷ olaraq д╟е÷arи≥tlи≥"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Ox_unmamд╠е÷ olaraq д╟е÷arи≥tlи≥"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Vacib"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Ox_unmamд╠е÷ olaraq д╟е÷arи≥tlи≥"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "Qovluд÷a _Daе÷д╠ ..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "Qovluд÷a _Kц╤ц╖ц╪rt..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Geri Gи≥tir"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "ц°nvan dи≥ftи≥ri и≥lavи≥ et"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Sц╪zgи≥clи≥r ф▐lavи≥ Et"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "д╟smarд╠cdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Mи≥ktublaе÷ma Qrupundakд╠ Sц╪zgи≥c"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "Mи≥ktublaе÷ma Qrupundakд╠ VFolder"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Mи≥ktublaе÷ma Qrupunda Sц╪z (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "(%s) Mи≥ktublaе÷ma Qrupundakд╠ VFolder"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Arzuya Baд÷lд╠ Mи≥'lumatlar"
+
 #: 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"
@@ -6719,8 +8132,7 @@ msgstr "'Mbox' fayllarд╠nд╠ 'Evolution' iц╖inи≥ gи≥tirir"
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr ""
-"'Outlook Express 4' mи≥ktublarд╠nд╠ 'Evolution' iц╖inи≥ gи≥tirи≥n "
-"e'malatxana."
+"'Outlook Express 4' mи≥ktublarд╠nд╠ 'Evolution' iц╖inи≥ gи≥tirи≥n e'malatxana."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
@@ -6771,16 +8183,16 @@ msgid "Evolution News Editor"
 msgstr "Evolution Hesab Dц╪zи≥ldicisi"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Dц╪zи≥ldicisi"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Imza faylд╠ : "
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6791,40 +8203,45 @@ msgstr ""
 "\n"
 "Dи≥yiе÷ikliklи≥ri qeyd etmak istи≥yirsiniz?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (varsayд╠lan) "
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Baд÷la"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Fи≥allaе÷dд╠r"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 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:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Geri Qaytar"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "Bunu и≥sas hesab olaraq gц╤stи≥r"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "Bu xи≥bи≥r hesabд╠nд╠ hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Evolution Hesab д╟darи≥cisi"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "_Mи≥ktub Qurд÷ularд╠..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6878,11 +8295,11 @@ msgstr ""
 "ePoц╖t gц╤ndи≥rmи≥kdи≥n и≥vvи≥l bir ePoц╖t\n"
 "nи≥qliyyatд╠nд╠ qurmalд╠san."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Mи≥ktub nи≥ql yolunu bildirmи≥misи≥n"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6890,7 +8307,7 @@ msgstr ""
 "Bu ismarд╠cд╠n mц╤vzusu yoxdur .\n"
 "Hи≥qiqи≥tи≥n dи≥ gц╤ndи≥rim?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6898,39 +8315,38 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 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:410
+#: mail/mail-callbacks.c:390
 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:653
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "%s da(dи≥) %s yazmд╠е÷dд╠r:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Bu ismarд╠cд╠ ц╖atdд╠r:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "д╟smarд╠c(larд╠) buraya daе÷д╠ "
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "д╟smarд╠c(larд╠) buraya kц╤ц╖ц╪rt"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, 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:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6938,7 +8354,7 @@ msgstr ""
 "Siz sadи≥cи≥ olaraq Vи≥zifи≥lи≥r qovluд÷undakд╠\n"
 "ismarд╠clarд╠ dц╪zи≥ldи≥ bilи≥rsiniz."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6946,24 +8362,41 @@ msgstr ""
 "Sadи≥cи≥ olaraq Gц╤ndи≥rilи≥n cи≥rgи≥sinи≥ qeyd edilи≥n\n"
 "ismarд╠clarд╠ yeniden gц╤nderebilirsiniz."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, 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
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "Heц╖ д╟smarд╠c Seц╖ilmи≥di"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "д╟smarд╠cд╠ Fи≥rqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "д╟smarд╠clarд╠ Fи≥rqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Xи≥bи≥rdarlд╠q"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Mи≥nи≥ bir dи≥ soruе÷ma"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6972,143 +8405,159 @@ msgstr ""
 "Sц╪zgи≥c mи≥'lumatд╠nд╠ yц╪klи≥mи≥ xи≥tasд╠:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "_Sц╪zgи≥clи≥r ..."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "д╟smarд╠cд╠ ц┤ap Et"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "д╟smarд╠larд╠n ц╖ap edilmи≥si bacarд╠lmadд╠"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, 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-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
-"Lц╪tfи≥n, adд╠nд╠zд╠ v ePoц╖t ц╪nvanд╠nд╠zд╠ aе÷aд÷д╠dakд╠ boе÷luд÷a yazд╠n. "
-"E-poц╖t ц╪nvanд╠nд╠zda gц╤rц╪nmи≥sini istи≥mirsinizsи≥, arzuya baд÷lд╠ "
-"sahи≥lи≥ri doldurmaд÷д╠nд╠z lazд╠m deyil. "
+"Lц╪tfи≥n, adд╠nд╠zд╠ v ePoц╖t ц╪nvanд╠nд╠zд╠ aе÷aд÷д╠dakд╠ boе÷luд÷a yazд╠n. E-poц╖t "
+"ц╪nvanд╠nд╠zda gц╤rц╪nmи≥sini istи≥mirsinizsи≥, arzuya baд÷lд╠ sahи≥lи≥ri doldurmaд÷д╠nд╠z "
+"lazд╠m deyil. "
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
-"Lц╪tfи≥n, gи≥lи≥n ePoц╖t vericisi ц╪ц╖ц╪n bilgi verin. ф▐gи≥r hansд╠ tц╪r "
-"bir sunucu iе÷lи≥tdiyinizi bilmirsinizsи≥, sistem idarи≥ц╖inizи≥, ya da "
-"д╟nternet xidmи≥t vericinizи≥ mц╪raciи≥t edin."
+"Lц╪tfи≥n, gи≥lи≥n ePoц╖t vericisi ц╪ц╖ц╪n bilgi verin. ф▐gи≥r hansд╠ tц╪r bir sunucu "
+"iе÷lи≥tdiyinizi bilmirsinizsи≥, sistem idarи≥ц╖inizи≥, ya da д╟nternet xidmи≥t "
+"vericinizи≥ mц╪raciи≥t edin."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
-"Lц╪tfи≥n, gedи≥n ePoц╖t vericisi ц╪ц╖ц╪n protokol mи≥'lumatд╠nд╠ aе÷aд÷д╠da "
-"bildirin. ф▐gи≥r hansд╠ protokolu iе÷lи≥tdiyinizi bilmirsinizsи≥, sistem "
-"idarи≥ц╖inizи≥, ya da д╟nternet servis saд÷layд╠cд╠nд╠za mц╪raciи≥t edinu."
+"Lц╪tfи≥n, gedи≥n ePoц╖t vericisi ц╪ц╖ц╪n protokol mи≥'lumatд╠nд╠ aе÷aд÷д╠da bildirin. "
+"ф▐gи≥r hansд╠ protokolu iе÷lи≥tdiyinizi bilmirsinizsи≥, sistem idarи≥ц╖inizи≥, ya da "
+"д╟nternet servis saд÷layд╠cд╠nд╠za mц╪raciи≥t edinu."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
-"E-poц╖t quraе÷dд╠rma и≥mи≥liyyatд╠ hardasa qurtardд╠. Kimlik "
-"qurд÷ularд╠nд╠z, gи≥lи≥n ve gedи≥n ePoц╖t sunucunuz Evolution hesabд╠nд╠zд╠ "
-"tanд╠mlamak ц╪ц╖ц╪n yeterli olacaktд╠r. Lц╪tfи≥n, aе÷aд÷д╠dakд╠ boе÷luд÷a bu "
-"hesab ц╪ц╖ц╪n bir ad veriniz. "
+"E-poц╖t quraе÷dд╠rma и≥mи≥liyyatд╠ hardasa qurtardд╠. Kimlik qurд÷ularд╠nд╠z, gи≥lи≥n ve "
+"gedи≥n ePoц╖t sunucunuz Evolution hesabд╠nд╠zд╠ tanд╠mlamak ц╪ц╖ц╪n yeterli "
+"olacaktд╠r. Lц╪tfи≥n, aе÷aд÷д╠dakд╠ boе÷luд÷a bu hesab ц╪ц╖ц╪n bir ad veriniz. "
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Sehirbazд╠"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 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 "
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " rи≥ng"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, 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
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Hesab"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Hesab Haqqд╠nda"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Hesab д╟darи≥si"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Hesablar"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ fayl"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Tanд╠tma"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Kimlik Yoxlama Nц╤vц╪: "
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr "ePoц╖tlarд╠ avtomatik yoxla:"
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "Yaz"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7124,281 +8573,257 @@ msgstr ""
 "\n"
 "Qurд÷ularд╠nд╠zд╠ qeyd etmи≥k ц╪ц╖ц╪n \"Qurtar\"a basд╠n."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "ф▐_sas"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Ekran"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Qurtardд╠"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Lahiyи≥lи≥r"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Lahiyи≥lи≥r cи≥rgи≥si:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Dц╪zи≥lt..."
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "E_nable"
+msgstr "Fи≥allaе÷dд╠r"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "ePoц╖t ц°nvanд╠: "
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Hazд╠rkд╠ faylд╠ fи≥rqli bir ad altд╠nda qeyd et"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Dц╪zи≥lt..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, 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:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "Imza faylд╠ : "
 
-#: mail/mail-config.glade.h:43
-#, fuzzy
-msgid "Highlight citations with"
-msgstr "Sitatlarд╠ Rи≥nglи≥ndir: "
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "_Xи≥tdи≥"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "ePoц╖t Quraе÷dд╠rд╠lmasд╠"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, 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:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "д╟smarд╠clarд╠ bundan sonra \"Oxundu\" olaraq iе÷arи≥tlи≥: "
+msgid "Make this my _default account"
+msgstr "Bunu и≥sas hesab olaraq gц╤stи≥r"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Xи≥bи≥rlи≥r"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Arzuya Baд÷lд╠ Mи≥'lumatlar"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Orqanizasiya"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 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:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Rи≥ng al"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 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:57
+#, fuzzy
+msgid "Prompt when sending messages with an _empty subject"
+msgstr "д╟smarд╠c gц╤ndrи≥rilи≥ bilmи≥di: alд╠cд╠ bildirilmи≥yib."
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+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
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail cи≥rgи≥si "
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "_Kotalanmд╠е÷"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "ePoц╖t Alд╠nд╠r"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "E-poц╖t Alд╠nд╠r"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Alma Seц╖и≥nи≥klи≥ri"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "д╟stи≥nи≥n Mи≥'lumatlar"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_Tи≥hlц╪kи≥sizlik"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Fayl seц╖"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP binarд╠nд╠ seц╖"
 
-#: 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:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "ePoц╖t Gц╤ndи≥rilir"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "E-poц╖t Gц╤ndи≥rilir"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Gц╤ndи≥rildi"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Gц╤ndи≥rilи≥n vи≥ Lahiyи≥ д╟smarд╠clarд╠"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Gц╤ndи≥rilи≥n ismarд╠clar cи≥rgи≥si:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Verici Quraе÷dд╠rд╠lmasд╠"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Verici Nц╤vц╪: "
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "Verici tanд╠tmaya ehtiyac hiss edи≥r"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Imza faylд╠ : "
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Qaynaqlar"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Mи≥'lumat Yoxdur"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Qaynaqlar"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Xц╪susi Cи≥rgи≥lи≥r"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX poц╖t qutusu faylд╠"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use secure connection (_SSL)"
 msgstr "E'tibarlд╠ baд÷lantд╠ (SSL) iе÷lи≥t"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "д╟stifadи≥ц╖i adд╠ :"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7406,15 +8831,119 @@ msgstr ""
 "\n"
 "Baе÷lamaq ц╪ц╖ц╪n \"Sonrakд╠\" dц╪ymи≥sinи≥ basд╠n. "
 
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "ePoц╖tlarд╠ avtomatik yoxla:"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr " Dи≥stи≥klи≥nи≥n nц╤vlи≥ri yoxla "
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "ePoц╖t ц°nvanд╠: "
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Tam Ad:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "Imza faylд╠ : "
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "Sitatlarд╠ Rи≥nglи≥ndir: "
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "Ev Sahibi:"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "д╟smarд╠clarд╠ bundan sonra \"Oxundu\" olaraq iе÷arи≥tlи≥: "
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "Ad :"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Orqanizasiya"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "PGP binarд╠ cд╠д÷д╠rд╠:"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Yol:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Bu parolu yadda saxla"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "ф▐sas olaraq ePoц╖tu HTML е·и≥klindи≥ gц╤ndи≥r"
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Imza faylд╠ : "
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "д╟stifadи≥ц╖i adд╠ :"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "saniyи≥."
 
@@ -7462,188 +8991,196 @@ msgstr "Dialoq qutusunu yarada bilmи≥dim ."
 msgid "Could not create a S/MIME decode context."
 msgstr "Dialoq qutusunu yarada bilmи≥dim ."
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ Faylд╠ Qeyd Et"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Diskи≥ Qeyd Et ..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "д╟ц╖и≥risini Gц╤stи≥r"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "%s da(dи≥) Aц╖ ..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "д╟ц╖и≥risini Gц╤stи≥r (%s ilи≥)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Gizlи≥t"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Xarici Gц╤stи≥rici"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "д╟smarд╠c iц╖indи≥kilи≥r yц╪klи≥nir"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Kц╤rpц╪nц╪ sи≥yyahda aц╖"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "ц°nvanд╠ kц╤ц╖ц╪r"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Fи≥rqli qeyd et"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Fи≥rqli qeyd et ..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Silinи≥n"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d saniyи≥"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapд╠е÷dд╠rд╠lmд╠е÷ fayl"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ismarд╠cд╠ aц╖д╠la bilmи≥di: Mи≥nbи≥ kodu gц╤steriliyor."
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "ePoц╖t ц°nvanд╠: "
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Gц╤ndи≥rи≥n"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "Cavab ver"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Gn:"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "Heц╖ GPG/PGP proqramд╠ qurulmayд╠b."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "Kodlanmд╠е÷ ismarд╠c gц╤stи≥rilmи≥di"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Kodlanmд╠е÷ д╟smarд╠c"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Kodu aц╖maq ц╪ц╖ц╪n timsala basд╠n."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 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."
+msgstr "Bu ismarд╠c digital olaraq imzalanmд╠е÷dд╠r vи≥ original olduд÷u dц╪е÷ц╪nц╪lц╪r."
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 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."
+"Bu ismarд╠c digital olaraq imzalanmд╠е÷dд╠r amma original olduд÷u dц╪е÷ц╪nц╪lmц╪r."
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytд╠nд╠ gц╤stи≥rи≥n ox (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, 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:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi gц╤stи≥rи≥n ox (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP saytд╠nд╠ gц╤stи≥rи≥n ox (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, 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:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr "Xи≥sи≥rli xarici proqram parц╖asд╠."
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "%s deyи≥ bir qovluq yoxdur"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "'%s' Aц╖д╠lд╠r"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluд÷u \"%s\" е÷и≥klinи≥ ц╖evrilir"
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7652,7 +9189,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:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7660,12 +9197,12 @@ msgstr ""
 "Bu qovluд÷u bir dи≥ aц╖a bilmи≥sи≥n, onu и≥llи≥\n"
 "bи≥rpa etmи≥lisи≥n."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, 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
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "%s i(д╠) Quraе÷dд╠r"
@@ -7688,105 +9225,130 @@ msgstr ""
 "ф▐mи≥liyyat aparд╠lд╠rkи≥n xи≥ta oldu:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Bu parolu yadda saxla"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "д╟е÷lи≥yir"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Qovluq yenidи≥n qurulur"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "E-poц╖t Alд╠nд╠r"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" Gц╤ndи≥rilir"
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarд╠c gц╤ndи≥rilir"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d ismarд╠cda xи≥ta"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Qurtadд╠."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "д╟smarд╠clar qovluд÷a qeyd edilir"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "д╟smarд╠clar \"%s\"a(и≥) daе÷д╠nд╠r"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "д╟smarд╠clar \"%s\"a(и≥) kц╤ц╖ц╪rц╪lц╪r"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Daе÷д╠nд╠r"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Kц╤ц╖ц╪rdц╪lц╪r"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakд╠ qovluqlar daranд╠r"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Zibil Qutusu"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluд÷u aц╖д╠lд╠r"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynaд÷д╠ aц╖д╠lд╠r"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "%s qovluд÷u aц╖д╠lд╠r"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluд÷u aц╖д╠lд╠r"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Qovluq sinxronlaе÷dд╠rд╠lд╠r"
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Qovluq yenidи≥n qurulur"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Qovluq aц╖д╠lд╠r"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarд╠cд╠ alд╠nд╠r"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "д╟smarд╠clar alд╠nд╠r"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "д╟smarд╠clar qeyd edilir"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7795,7 +9357,7 @@ msgstr ""
 "Nи≥ticи≥ faylд╠ yaradд╠la bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7804,11 +9366,11 @@ msgstr ""
 "д╟smarд╠clarд╠n buraya qeyd edilmи≥ xatasд╠: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7817,87 +9379,83 @@ msgstr ""
 "Yekun faylд╠ yaradд╠la bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazд╠la bilmи≥di: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "A_xtar"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "( Adsд╠z )"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "ц┤oxlu д╟smarд╠c"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "д╟smarд╠cд╠ Dц╪zи≥lt"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "д╟smarд╠cд╠ Dц╪zи≥lt"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "ц┤atdд╠r"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "Axtar"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "Yol:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Lи≥д÷v Edilir ..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "ePoц╖t Gц╤ndи≥r vи≥ Al"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Alд╠nд╠r"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "Gц╪ncи≥llи≥nir ..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "Gц╤zlи≥nilir ..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "Gц╤ndи≥rilir"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Lи≥д÷v Edildi."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr "д╟stifadи≥ц╖i и≥mи≥liyyatд╠ lи≥д÷v etdi."
 
@@ -7916,82 +9474,88 @@ msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c - %s"
 msgid "Forwarded message"
 msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "VFolderlи≥r"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Dvm: (mц╤vzusuz)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "д╟smarд╠c"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Gц╤rц╪lmи≥miе÷"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Gц╤rц╪lmц╪е÷"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Cavab cerilmiе÷"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "ц┤oxlu Gц╤rц╪lmи≥miе÷ д╟smarд╠c"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "ц┤oxlu д╟smarд╠c"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "ф▐n Alц╖aq"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Alц╖alt"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "Yц╪ksи≥k"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "ф▐n Yц╪ksи≥k"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Bugц╪n %l:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Sabah: %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "д╟smarд╠clar qeyd edilir"
 
 #: mail/message-list.etspec.h:2
@@ -8006,38 +9570,78 @@ msgstr "Alд╠ndд╠"
 msgid "Size"
 msgstr "Bц╤yц╪klц╪k"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Qovluq"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "Saxla"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Bunula baе÷layan qovluqlarд╠ gц╤stи≥r:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "\"%s\" dakд╠ qovluqlar daranд╠r"
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "\"%s\" ц╪ц╖ц╪n saxlama amи≥liyyatд╠ aparд╠lд╠r"
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "\"%s\" dakд╠ qovluqlar daranд╠r"
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" qovluд÷una qeydiyyat aparд╠lд╠r"
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" qovluд÷una qeydiyyat silinir"
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Qovluq"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "Heц╖ д╟smarд╠c Seц╖ilmи≥di"
+
+#: mail/subscribe-dialog.c:1547
+#, fuzzy
+msgid "Please select a server."
+msgstr "Xidmц╕t seц╖"
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Siyahд╠nд╠ Yenilи≥"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Qovluqlar"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Gц╤stи≥rmи≥ Seц╖и≥nи≥klи≥ri :"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "ц°zvlц╪klи≥ri Dц╪zи≥lt"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Qeydiyyatdan Keц╖"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Qeydiyyatdan ц┤д╠x"
+
 #: 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д╠."
@@ -8046,54 +9650,71 @@ msgstr "д╟cracд╠ mц╪ndи≥ricat ц╪ц╖ц╪n 'Evolution' parц╖asд╠."
 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
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 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
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Gц╤rц╪е÷lи≥r"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Gц╤rц╪е÷lи≥ri gц╤stи≥r"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%a %l %M %p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Poц╖t Mц╪ndи≥ricatд╠"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Ad :"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Evolution qurulmasд╠"
+msgid "Summary Settings"
+msgstr "Xц╪lasи≥ daxil edи≥n"
 
 #: my-evolution/e-summary-rdf.c:281
 #, fuzzy
@@ -8105,7 +9726,12 @@ msgstr "Tи≥qvim faylд╠ yц╪klи≥nи≥rkи≥n xи≥ta oldu."
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Tи≥qvim yц╪klи≥mи≥ xи≥tasд╠</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "_Yeni Qovluq"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
@@ -8114,28 +9740,33 @@ msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Baе÷qa"
+
+#: my-evolution/e-summary-weather.c:664
 #, 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"
+msgid "%A, %B %e %Y"
+msgstr "%a %B %d %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolution"
+msgid "Print Summary"
+msgstr "Mц╪ndи≥ricat"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "д╟smarд╠larд╠n ц╖ap edilmи≥si bacarд╠lmadд╠"
 
 #: my-evolution/main.c:52
@@ -8143,6 +9774,42 @@ msgstr "д╟smarд╠larд╠n ц╖ap edilmи≥si bacarд╠lmadд╠"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 
+#: my-evolution/metar.c:29
+msgid "F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Yazд╠ nц╤vlи≥ri"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Daе÷д╠nд╠r"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Sц╪zgи≥clи≥r ..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Sц╪zgи≥clи≥r ..."
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9335,129 +11002,145 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Cavab cerilmiе÷"
+msgid " _Remove"
+msgstr "Sil"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Qovluqlar"
+msgid "Add n_ew feed"
+msgstr "Cavab cerilmiе÷"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Bц╪tц╪n Ziyarи≥tц╖ilи≥r"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "Bц╪tц╪n Ziyarи≥tц╖ilи≥r"
+msgid "All _folders:"
+msgstr "Qovluqlar"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Bunula baе÷layan qovluqlarд╠ gц╤stи≥r:"
+msgid "All news _feeds:"
+msgstr "Cavab cerilmiе÷"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Gц╤stи≥rmи≥ Seц╖и≥nи≥klи≥ri :"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "Ekran"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "Cц╪mи≥"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "ay"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "2 hи≥ftи≥"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "ц┤и≥rе÷и≥nbи≥"
+msgid "Tasks "
+msgstr "Vи≥zifи≥"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "ay"
+msgid "Units: "
+msgstr ""
+"\n"
+"   Bц╤lmи≥:\t"
 
 #: 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 ""
+msgid "Weather settings"
+msgstr "Seц╖kilи≥ri tи≥mizlи≥"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr ""
-"Vaxt\n"
-"Planlaе÷dд╠r"
+msgid "_Display folders:"
+msgstr "Bunula baе÷layan qovluqlarд╠ gц╤stи≥r:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
+msgid "_Display stations:"
+msgstr "Gц╤stи≥rmи≥ Seц╖и≥nи≥klи≥ri :"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "bц╪tц╪n fи≥al uzaq qovluqlarla"
+msgid "_Displayed feeds:"
+msgstr "Ekran"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
+msgid "_Five days"
+msgstr "Cц╪mи≥"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "Vи≥zifи≥"
+msgid "_Mail"
+msgstr "ePoц╖t"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"   Bц╤lmи≥:\t"
+msgid "_News Feeds"
+msgstr "_Yeni Qovluq"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Baе÷qa"
+msgid "_One day"
+msgstr "ц┤и≥rе÷и≥nbи≥"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "Seц╖kilи≥ri tи≥mizlи≥"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "Aprel"
+msgid "_Schedule"
+msgstr ""
+"Vaxt\n"
+"Planlaе÷dд╠r"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "bц╪tц╪n fи≥al uzaq qovluqlarla"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Baе÷qa"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "Aprel"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9474,7 +11157,17 @@ msgstr "ф▐traflд╠"
 msgid "Cancel Operation"
 msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Xц╪susi Cи≥rgи≥lи≥r"
@@ -9494,8 +11187,8 @@ msgstr ""
 #: 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."
+"Lц╪tfи≥n \"Oldu\"'ya tд╠qlayд╠b, fayllarд╠ qurun, ya da \"Lи≥д÷v Et\"и≥ basaraq "
+"ц╖д╠xд╠n."
 
 #: shell/e-setup.c:170
 msgid "Could not update files correctly"
@@ -9507,8 +11200,7 @@ msgstr "Dи≥yи≥sи≥n \"Evolution\"д╠ ilk dи≥fи≥ iе÷и≥ salд╠rsan."
 
 #: 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:220
 #, c-format
@@ -9528,7 +11220,7 @@ msgid ""
 "`%s'."
 msgstr "Faylд╠ oxurkи≥n bir xи≥ta oldu ."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9539,7 +11231,7 @@ msgstr ""
 "\"Evolution\" istifadи≥ц╖i fayllarд╠nin qurulmasд╠\n"
 "ц╪ц╖ц╪n onu sil."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9548,7 +11240,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9559,57 +11251,80 @@ msgstr ""
 "\"Evolution\" qovluд÷unda yerlи≥е÷mir. \"Evolution\" \n"
 "istifadи≥ц╖i fayllarд╠nin qurulmasд╠ ц╪ц╖ц╪n onu sil."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Qovluq alд╠na bilmи≥di: %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "Fayllarд╠ `%s''yи≥\n"
 "kц╤ц╖ц╪rdи≥ bilmи≥dim ."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Qovluд÷a Kц╤ц╖ц╪rt"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Qovluд÷a Kц╤ц╖ц╪r"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"`%s' qovluд÷u silinи≥ bilmir:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "%s gц╪n sonra sil"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, 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
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "%s qovluд÷u aц╖д╠lд╠r"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Qayda adд╠ :"
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Qovluq adд╠:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9623,7 +11338,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "Bildirilи≥n qovluq adд╠ hц╤kmlц╪ deyildir ."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "\"Evolution\" - Yeni qovluq yarat"
 
@@ -9635,11 +11350,11 @@ msgstr ""
 "Bildirilи≥n gediе÷ ц╪ц╖ц╪n bu seц╖ili qovluq nц╤vц╪ \n"
 "hц╤kmlц╪ deyildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Yeni ..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "( Adsд╠z )"
 
@@ -9651,11 +11366,11 @@ msgid ""
 "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"
+"\"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."
+"ф▐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.
@@ -9679,7 +11394,7 @@ msgstr ""
 "%s Alд╠nд╠r\n"
 "%d ц╪zvц╪ alд╠nд╠r."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9728,7 +11443,7 @@ msgstr "Avtomatik"
 msgid "Filename:"
 msgstr "Fayl adд╠:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Fayl seц╖"
 
@@ -9736,32 +11451,54 @@ msgstr "Fayl seц╖"
 msgid "File type:"
 msgstr "Fayl nц╤vц╪:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "Qovluq Seц╖in"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Evolutionun ePoц╖t parц╖asд╠nд╠ baе÷lada bilmи≥dim ."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH yolunda tapд╠la bilmи≥di."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "\"Bug-buddy\" iе÷и≥ salд╠na bilmи≥di."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Tи≥lif haqqд╠ 1999, 2000, 2001 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9770,88 +11507,104 @@ 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:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Qovluд÷a get ..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Yeni bir qд╠sa yol qrupu yarat"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "Xи≥tdи≥ д╟е÷lи≥"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Xи≥tdи≥n Qopuq д╟е÷lи≥"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 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-shell-view.c:1411
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, 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
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views 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
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "Oldu"
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "Hц╤kmsц╪z ismarд╠c mц╤vtи≥viyyatд╠"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "Nц╪sxи≥ni qabд╠q ilи≥ qeyd edи≥ bilmи≥dim"
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "ц°mumi xи≥ta"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Yeni bir qд╠sa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Qrup adд╠ :"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9860,182 +11613,168 @@ msgstr ""
 "`%s' Qrupunu qд╠sa yol ц╖ubuд÷undan hи≥qiqи≥tи≥n \n"
 "dи≥ silmи≥k istи≥yisiniz?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Silmи≥"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Bu qд╠sa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Bu qд╠sa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "_Kiц╖ik Timsallar"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Qд╠sa yollarд╠ kiц╖ik timsallar olaraq gц╤stи≥r"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "_Bц╤yц╪k Timsallar"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Qд╠sa yollarд╠ bц╤yц╪k timsallar olaraq gц╤stи≥r"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Yeni Qrup..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Yeni bir qд╠sa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Bu Qrupu _Sil..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Bu qд╠sa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Bu Qrupu _Sil..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Bu qд╠sa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "Qд╠sa yol ц┤ubuд÷unu _Gizlи≥t"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Qд╠sa yol ц┤ubuд÷unu Gizlи≥t"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Bu qд╠sa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Yeni Pи≥ncи≥rи≥dи≥ Aц╖"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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:479
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Bu qд╠sa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu qд╠sa yolu qд╠sa yol ц╖ubuд÷undan sil"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Qд╠sa yollarд╠ qeyd edи≥rkи≥n xи≥ta oldu."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, 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
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "( Adsд╠zdд╠r )"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Xи≥ta yoxdur"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "ц°mumi xи≥ta"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlд╠ bir qovluq onsuz da var"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Bildirilи≥n qovluq nц╤vц╪ hц╤kmlц╪ deyildir"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "G/ц┤ xи≥tasд╠"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Qovluд÷u yaratmaq ц╪ц╖ц╪n lazд╠mi disk sahи≥si yoxdur"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Bildirilи≥n qovluq tapд╠la bilmи≥di"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazд╠lmamд╠е÷dд╠r"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "ф▐mи≥liyyat dи≥stи≥klи≥nmir"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 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-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Bildirilи≥n qovluq tapд╠la bilmи≥di"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% _Qurtardд╠:"
 
@@ -10057,10 +11796,6 @@ msgstr "Ev Sahibi:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Qovluq adд╠:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Qovluq nц╤vц╪:"
@@ -10071,22 +11806,32 @@ msgstr "Qovluд÷un yaradд╠lacaд÷д╠ yeri gц╤stи≥rin:"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Faylд╠n \"Evolution\" iц╖ina alд╠nmasд╠ ц╪ц╖ц╪n \"Al\" dц╪ymи≥sini "
-"tд╠qlayд╠n. "
+msgstr "Faylд╠n \"Evolution\" iц╖ina alд╠nmasд╠ ц╪ц╖ц╪n \"Al\" dц╪ymи≥sini tд╠qlayд╠n. "
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "\"Evolution\" Alma Vasitи≥si"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "\"Evolution\" Alд╠cд╠ Vasitи≥si"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Fayl seц╖"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "\"Evolution\" Alma Vasitи≥sinи≥ Xoе÷ Gи≥ldiniz.\n"
@@ -10108,10 +11853,11 @@ msgid "Don't ask me again"
 msgstr "Mи≥nи≥ bir dи≥ soruе÷ma"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
-msgstr ""
+#, fuzzy
+msgid "Evolution can import data from the following files:"
+msgstr "Mи≥ktub taе÷kilatcд╠sд╠ 'Evolution' parц╖asд╠."
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10130,15 +11876,13 @@ msgstr ""
 "Salam. \"Evolution\" Nц°MAYд╟е· buraxд╠lд╠е÷д╠nд╠ sд╠namaд÷a \n"
 "vaxt tapdд╠д÷д╠nд╠z ц╪ц╖ц╪n minnи≥tdarд╠q.\n"
 "\n"
-"\"Evolution\" hи≥lи≥ tamamilи≥ azyд╠lmayд╠b. Dц╪zdц╪r artд╠q sona "
-"ц╖atд╠rд╠q.\n"
+"\"Evolution\" hи≥lи≥ tamamilи≥ azyд╠lmayд╠b. Dц╪zdц╪r artд╠q sona ц╖atд╠rд╠q.\n"
 "Amma hи≥lи≥ dи≥ edilи≥cи≥k bи≥'zi iе÷lи≥r var.\n"
 "\n"
-"Aд÷д╠r bir iе÷in nи≥ticи≥sini bи≥yи≥ndiyinizi ц╪mid edib, sizin "
-"fikirlи≥rinizi\n"
+"Aд÷д╠r bir iе÷in nи≥ticи≥sini bи≥yи≥ndiyinizi ц╪mid edib, sizin fikirlи≥rinizi\n"
 "gц╤zlи≥yirik!\n"
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10146,25 +11890,30 @@ msgstr ""
 "Minnи≥tdarд╠q\n"
 "\"Evolution\" Dи≥stи≥si\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "\"Evolution\" qabд╠д÷д╠nд╠ baе÷lada bilmи≥dim ."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "\"Evolution\" qabд╠д÷д╠nд╠ baе÷lada bilmи≥dim ."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "Aц╖д╠lд╠е÷ ekranд╠nд╠ gц╤sdи≥rmи≥"
 
-#: shell/main.c:216
+#: shell/main.c:229
 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:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parц╖alar sistemini baе÷lada bilmи≥dim."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kц╤ц╖ц╪rt"
 
@@ -10181,11 +11930,11 @@ msgstr "Yeni bir hesab yarat"
 msgid "Create new contact list"
 msgstr "Yeni bir hesab yarat"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Kи≥s"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Seц╖ilи≥ni kи≥s"
 
@@ -10194,78 +11943,121 @@ msgstr "Seц╖ilи≥ni kи≥s"
 msgid "Delete selected contacts"
 msgstr "ф▐laqи≥ni sil"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Yeni и≥laqи≥"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Xи≥bи≥rlи≥r"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Yapд╠е÷dд╠r"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Ara yaddaе÷д╠ yapд╠е÷dд╠r"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, 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
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "ф▐laqи≥lи≥ri ц╖ap et"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "ф▐laqи≥ni sil"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Hamд╠sд╠nд╠ Seц╖"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "ф▐laqи≥ni sil"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "ф▐laqи≥yи≥ yeni bir _ismarд╠c gц╤ndи≥r..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "ф▐laqи≥ni sil"
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "ф▐laqи≥yи≥ yeni bir ismarд╠c gц╤ndи≥r"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "ф▐laqи≥ni baе÷qasд╠na gц╤ndи≥r"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Dayan"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Yц╪klи≥mи≥ni Dayandд╠r"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "_Gediе÷lи≥r"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "_ц°nvan Dи≥ftи≥ri Qaynaд÷д╠..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_ф▐laqи≥"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_ф▐laqи≥lи≥r ..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_ц┤ap Et ..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "VCard olaraq qeyd et"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "ф▐laqи≥lи≥ri a_xtar"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Vasitи≥lи≥r"
 
@@ -10275,112 +12067,131 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "Yeni bir bц╪tц╪n gц╪n hadisи≥si yarat"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Yeni bir iclas yarat"
+msgid "Create a New _Task"
+msgstr "Yeni bir vи≥zifи≥ yarat"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Yeni bir iclas yarat"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "Gц╪n"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Bu iclasд╠ sil"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Get"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Vaxtda geri get"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Vaxtda irи≥li get"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "_Tarixи≥ Get"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Xц╪susi bir tarixи≥ get"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "д╟ndiki vaxta get"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Gц╪nи≥ Get"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "_Ay"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Yeni д╟clas"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Yeni Vи≥zifи≥"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "ц┤ap edilи≥cи≥k tи≥qvimi nц╪mayiе÷ etdirи≥r"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Tи≥qvimi ц╖ap et"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Bu Tи≥qvim ц╖ap et"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "ц┤ap Etmи≥ Nц╪ma_yiе÷i"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "д╟stи≥nи≥n Mи≥'lumatlar"
+msgid "Print this calendar"
+msgstr "Bu Tи≥qvim ц╖ap et"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "1 gц╪nц╪ gц╤stи≥r"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "1 ayд╠ gц╤stи≥r"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "2 hи≥ftи≥ni ц╤ster"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "д╟е÷ hи≥ftи≥sini gц╤stи≥r"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "д╟_е÷  hи≥ftи≥si"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "Hи≥ftи≥"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "д╟_clas"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, 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:33
-msgid "_Month"
-msgstr "_Ay"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "д╟stи≥nи≥n Mи≥'lumatlar"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "_Hи≥ftи≥"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_Vи≥zifи≥"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10391,15 +12202,16 @@ msgid "Close"
 msgstr "Qapat"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Bu iclasд╠ qapat"
+#, fuzzy
+msgid "Close this item"
+msgstr "Bu ц╪zvц╪ sil"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Bu iclasд╠ sil"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Bu ц╪zvц╪ sil"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Ana vasitи≥ ц╖ubuд÷u"
 
@@ -10408,118 +12220,85 @@ msgstr "Ana vasitи≥ ц╖ubuд÷u"
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "ц┤ap Et ..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Qeyd Et"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Vи≥zifи≥ni qeyd et vи≥ dialoqu qapat"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Kц╤mи≥k"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "_Zи≥rfi ц┤ap Et..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "_Fи≥rqli Qeyd Et ..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "ф▐laqи≥ni qeyd et vи≥ dialoqu qapat"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "ф▐laqи≥ni fи≥rqli yerи≥ gц╤_ndи≥r..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Xи≥tdи≥ki Kц╤mи≥yи≥ bax"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "ф▐laqи≥yи≥ yeni bir _ismarд╠c gц╤ndи≥r..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Qeyd Et ..."
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Bu ц╪zvц╪ sil"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Sil..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Vи≥zifи≥ni qeyd et vи≥ dialoqu qapat"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "ф▐laqи≥ni fи≥rqli yerи≥ gц╤_ndи≥r..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "ф▐laqи≥yи≥ yeni bir _ismarд╠c gц╤ndи≥r..."
@@ -10529,22 +12308,22 @@ msgstr "ф▐laqи≥yи≥ yeni bir _ismarд╠c gц╤ndи≥r..."
 msgid "Cancel Mee_ting"
 msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "v_Calendar е·и≥klindи≥ ц┤atdд╠r (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Bu ismarд╠cд╠ ц╖atdд╠r"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10559,16 +12338,11 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr "_Gц╤rц╪е÷lи≥ri Planlaе÷dд╠r"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "Gц╤rц╪е÷ Cи≥dvи≥li"
 
-#: 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-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10585,68 +12359,65 @@ msgid "Cancel the current mail operation"
 msgstr "Hazд╠rkд╠ faylд╠ qeyd et"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Yaz"
-
-#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "Yeni bir ePoц╖t ismarд╠cд╠ yaz"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Zibil qutusunu _boе÷alt"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "_Parollarд╠ Unut"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "Al_t Qeydlи≥ri д╟darи≥ Et..."
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Sonrakд╠ д╟smarд╠c"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Seц╖ili ismarд╠clarд╠ baе÷qa bir cи≥rgи≥yи≥ daе÷д╠"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Al / Gц╤ndи≥r"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Sorд÷ulanmд╠е÷ mи≥ktubu gц╤ndи≥r vи≥ yeni mи≥ktublarд╠ al"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "Virtual Qovluq _Dц╪zи≥ldicisi..."
 
@@ -10671,97 +12442,108 @@ msgstr "Nц╪mayiе÷"
 msgid "_Send / Receive"
 msgstr "_Gц╤ndи≥r / Al"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "\"%s\" qovluд÷una qeydiyyat aparд╠lд╠r"
+
 #: 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-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Seц╖ili ismarд╠clarд╠ sil"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Kи≥s"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Seц╖ili ismarд╠clarд╠ sil"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "S_eц╖ili д╟smarд╠clarд╠ Gizlи≥t"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "_Silinmiе÷ д╟smarд╠clarд╠ Gizlи≥t"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "_Oxunmuе÷ д╟smarд╠clarд╠ Gizlи≥t"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Hamд╠sд╠nд╠ O_xunmд╠е÷ olaraq д╟е÷arи≥tlи≥"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "д╟е÷arи≥tlи≥"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Ara yaddaе÷д╠ yapд╠е÷dд╠r"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Seц╖ili ismarд╠clarд╠ baе÷qa bir cи≥rgи≥yи≥ daе÷д╠"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Hamд╠sд╠nд╠ Seц╖"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "д╟l_gи≥yi Seц╖"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Seц╖ili ismarд╠clarд╠ sil"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "_Hamд╠sд╠nд╠ Gц╤stи≥r"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "_Oxunmuе÷ д╟smarд╠clarд╠ Gizlи≥t"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Temporarily hide all messages that have already been read"
 msgstr "д╟е÷arи≥tlи≥"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Seц╖ili ismarд╠clarд╠ sil"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "д╟lgи≥k_lи≥nmiе÷ д╟smarд╠clar Siyahд╠sд╠"
 
@@ -10769,7 +12551,7 @@ msgstr "д╟lgи≥k_lи≥nmiе÷ д╟smarд╠clar Siyahд╠sд╠"
 msgid "_Expunge"
 msgstr "_Tи≥mizlи≥"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Qovluq"
 
@@ -10777,11 +12559,11 @@ msgstr "_Qovluq"
 msgid "_Invert Selection"
 msgstr "Seц╖kiyi _Tи≥rs ц┤evir"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_Seц╖и≥nи≥klи≥r..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "д╟lgи≥k_lи≥nmiе÷ д╟smarд╠clar Siyahд╠sд╠"
@@ -11031,7 +12813,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "д╟е÷arи≥tlи≥"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "ц┤ap edilи≥cи≥k ismarд╠cд╠ nц╪mayiе÷ etdirи≥r"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11053,42 +12836,36 @@ msgstr "ф▐vvи≥lki д╟smarд╠c"
 msgid "Previous Unread Message"
 msgstr "ф▐vvи≥lki д╟smarд╠c"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "д╟smarд╠cд╠ ц╖ap et ..."
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "ц┤ap Etmи≥ nц╪mayiе÷i"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "д╟smarд╠cд╠ ц┤ap Et"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Cavab ver"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Hamд╠sд╠na cavab ver"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "д╟smarд╠cд╠ A_xtar"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "д╟smarд╠cд╠ yeni bir fayla qeyd et"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Sи≥hifи≥ qurд÷ularд╠nд╠ hazд╠rkд╠ ц╖ap edicinizи≥ gц╤ra uyд÷unlaе÷dд╠rд╠n"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -11137,74 +12914,57 @@ msgstr "_Alд╠cд╠dakд╠ vFolder"
 msgid "VFolder on _Subject..."
 msgstr "_Mц╤vzudakд╠ vFolder"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "Sц╪zgи≥clи≥ri ф▐_lavи≥ Et"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Qovluд÷a Kц╤ц╖ц╪rt"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "д╟smarд╠cdan Qayda _Yarat"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "д╟smarд╠clar"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Qovluд÷a Kц╤ц╖ц╪r"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Ekran"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "д╟_smarд╠clarд╠ Yenidи≥n Gц╤ndи≥r"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "д╟_smarд╠clarд╠ Yenidи≥n Gц╤ndи≥r"
-
 #: 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-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-messagedisplay.xml.h:4 ui/evolution.xml.h:11
-msgid "Customize"
-msgstr "_Xц╪susilи≥е÷dir"
-
-#: 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-messagedisplay.xml.h:8
+#: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Qapat"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Gц╤stи≥r"
 
@@ -11271,11 +13031,6 @@ msgstr "PGP kodla"
 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"
@@ -11406,7 +13161,7 @@ msgstr "_Cavab_Verlи≥cи≥k Giriе÷i"
 msgid "_Security"
 msgstr "_Tи≥hlц╪kи≥sizlik"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Kц╤mи≥k"
 
@@ -11440,15 +13195,28 @@ msgstr "Qeydiyyatdan ц┤д╠x"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "Ayrд╠l_mд╠е÷ Vи≥zifи≥ (FIXME)"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "Yeni Vи≥zifи≥"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Bu vи≥zifи≥ni sil"
+msgid "Cancel this task"
+msgstr "Yeni Vи≥zifи≥"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "Siyahд╠nд╠ Yenilи≥"
@@ -11457,44 +13225,32 @@ msgstr "Siyahд╠nд╠ Yenilи≥"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Seц╖ili ц°zvlи≥ri _Aц╖"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Yeni bir vи≥zifи≥ yarat"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Bu vи≥zifи≥ni sil"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, 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:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "_Mи≥ktub Qurд÷ularд╠..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_Vи≥zifи≥"
 
@@ -11532,186 +13288,167 @@ msgstr "Bu qд╠sa yolu qд╠sa yol ц╖ubuд÷undan sil"
 msgid "Create a new folder"
 msgstr "Yeni bir qovluq yarat"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Bu ц╪zvц╪ sil"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Baе÷qa bir qovluд÷u gц╤stи≥r"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "ц┤д╠_x"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "Evolution _Pи≥ncи≥rи≥si"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Proqramdan ц╖д╠x"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "Ne_cи≥ Baе÷layaram"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Xarici fayl е÷и≥klini idxal et"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Seц╖ili ismarд╠clarд╠ baе÷qa bir cи≥rgи≥yи≥ daе÷д╠"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "Yeni Pи≥ncи≥rи≥dи≥ Aц╖"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 #, 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
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "\"Evolution\" haqqд╠nda mи≥'lumat gц╤stи≥r"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Xи≥ta Raportunu Gц╤ndи≥r"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "_Xи≥ta Raportunu Gц╤ndи≥r"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "\"Bug-buddy\" dи≥stи≥yi ilи≥ bir xи≥ta raportunu gц╤ndи≥r"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Toggle"
 msgstr "Rolu"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Qovluqlar ц╖ubuд÷unun nц╪mayiе÷ etdirilи≥cи≥yi yeri bildir"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 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:33
+#: ui/evolution.xml.h:29
 #, 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:35
-msgid "Using the _Calendar"
-msgstr "_Tи≥qvimi Necи≥ д╟е÷lи≥dim"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "_ePoц╖t bц╤lmи≥sini necи≥ д╟е÷lи≥dim"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Seц╖ili qovluд÷u gц╤stи≥r"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Evolution Haqqд╠nda..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Gц╤rц╪е÷ (ABY)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_ф▐laqи≥lи≥r"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "_Kц╤ц╖ц╪rt"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "_Qovluq ц┤ubuд÷u"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "Qovluд÷a _Get ..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "Faylд╠ _д╟daxl Et ... "
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "_д╟ndeks"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "_Mи≥ktub д╟smarд╠cд╠"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "Daе÷д╠"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Yeni Qovluq"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Aц╖ ..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "_Qд╠sa Yol ц┤ubuд÷u"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 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
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Xи≥tdи≥n Qopuq д╟е÷lи≥"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "Bu cи≥rgи≥nin xц╪susiyyи≥tlи≥rini dи≥yiе÷dir"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
-msgstr "_Mи≥ktub Qurд÷ularд╠..."
+msgid "Print summary"
+msgstr "Poц╖t Mц╪ndи≥ricatд╠"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Oxu"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "д╟cracд╠ Mц╪ndи≥ricat Qurд÷ularд╠..."
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
@@ -11746,6 +13483,30 @@ msgstr "д╟smarд╠clar"
 msgid "With Category"
 msgstr "Kateqoriya ilи≥"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Fayl seц╖"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Bц╤lmи≥lи≥r :"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zaman zolaд÷д╠:  "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11753,10 +13514,6 @@ msgstr "Kateqoriya ilи≥"
 msgid "%A, %B %d, %Y"
 msgstr "%a %B %d %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Mи≥е÷д÷ul"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "д╟е÷ Yerindи≥ Deyil"
@@ -11829,7 +13586,7 @@ msgstr "Bц╪tц╪n Ziyarи≥tц╖ilи≥r"
 msgid "_Current View"
 msgstr "_Hazд╠rkд╠ Gц╤rц╪nц╪е÷"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "Gц╤rц╪nц╪е÷lи≥ri Mц╪и≥yyи≥nlи≥е÷dir"
 
@@ -11839,19 +13596,20 @@ msgstr "Gц╤rц╪nц╪е÷lи≥ri Mц╪и≥yyи≥nlи≥е÷dir"
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "д╟ndi"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Bugц╪n"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "Oldu"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Gц╪n %s е÷и≥klindи≥ girilmи≥lidir."
@@ -11938,35 +13696,33 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "ф▐laqи≥ dц╪zи≥ldicisi"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Axtarд╠е÷д╠ Qeyd Et"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "ф▐traflд╠ Axtarд╠е÷"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Axtarд╠е÷д╠ Qeyd Et"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Tи≥_mizlи≥"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Hamд╠sд╠nд╠ Gц╤stи≥r"
 
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "ф▐traflд╠..."
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Mи≥'lumat"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Xи≥bи≥rdarlд╠q"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Xи≥ta"
@@ -11984,10 +13740,15 @@ 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:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Ax_tar"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "Cild DN:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "е·и≥xsi ц°nvan Dи≥ftи≥ri Vericisi"
@@ -12008,6 +13769,305 @@ msgstr "init_corba(): GNOME baе÷ladд╠la bilmи≥di"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 
+#~ msgid "RDF Summary"
+#~ msgstr "RDF Mц╪ndи≥ricatд╠"
+
+#~ msgid "LDAP Server"
+#~ msgstr "LDAP Vericisi"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Namи≥'lum ц╪nvan dи≥ftи≥ri"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Heц╖ biri (adsд╠z halд╠)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Namи≥'lum tanд╠tma nц╤vц╪"
+
+#~ msgid "Subtree"
+#~ msgstr "Alt Aд÷ac"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Namи≥'lum hи≥rи≥kи≥t nц╤vц╪"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "FIZME DN Kц╤mи≥k Mи≥tnini bura cala"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "FIXME Yuva kц╤mи≥k mwtni burada."
+
+#~ msgid "Root DN:"
+#~ msgstr "Kц╤k DN :"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "FIXME Kц╤k Dn kц╤mи≥k mи≥tni burda."
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "FIXME Qapд╠ kц╤mи≥k mи≥tni burda."
+
+#~ msgid "Authentication:"
+#~ msgstr "Tanд╠tma :"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "FIXME Cд╠д÷д╠r Kц╤mи≥k mи≥tni burda."
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Belи≥ bir yol yoxdursa yarat."
+
+#~ 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."
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "FIXME Ad kц╤mи≥k mи≥tbi burda."
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "FIXME д╟zah kц╤mи≥k mи≥tbi burda."
+
+#~ msgid "Name"
+#~ msgstr "Ad"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "%s ц╪ц╖ц╪n parol girin"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "Ad daxil edи≥n"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "Adд╠ buradan seц╖:"
+
+#~ msgid "USA"
+#~ msgstr "ABе·"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Lи≥д÷v Edildi"
+
+#~ msgid "Transparent"
+#~ msgstr "е·и≥ffaf"
+
+#~ msgid "Opaque"
+#~ msgstr "Mat"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr "Siniflи≥dirmи≥ 'ц°mumi', 'Xц╪susi', 'Gizli' ya da 'Heц╖ Biri' olmalд╠dд╠r"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "е·и≥ffaflд╠q 'е·и≥ffaf', 'д╟е÷д╠q Keц╖irmи≥z' vи≥ ya 'Heц╖ Biri' olmalд╠dд╠r."
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Alarm pи≥ncи≥rи≥si ц╖д╠xanda biiplи≥."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Tи≥qvim Seц╖и≥nи≥klи≥ri"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "Tarix sи≥yyahд╠ xц╪susiyyи≥tlи≥ri"
+
+#~ msgid "Defaults"
+#~ msgstr "ф▐saslar"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Bц╪tц╪n Gц╤rц╪е÷lи≥rimi Bildir"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "dи≥qiqи≥ и≥vvи≥lindи≥ onlar meydana ц╖д╠xд╠rlar."
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Silinи≥n"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Yoxdur"
+
+#~ msgid "Task"
+#~ msgstr "Vи≥zifи≥"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% _Qurtardд╠:"
+
+#~ msgid "Transparency"
+#~ msgstr "е·и≥ffaf"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Bu ismarд╠c hazд╠rda mц╤vcuddur"
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Qovluq geri dц╤nц╪lmи≥z е÷и≥kildи≥ xи≥sarи≥t alд╠b."
+
+#~ msgid "All"
+#~ msgstr "Hamд╠sд╠"
+
+#~ msgid "Edit"
+#~ msgstr "Dц╪zи≥lt"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Axtarд╠е÷д╠ vFolder olaraq saxla"
+
+#~ msgid "Resend"
+#~ msgstr "Yenidи≥n Gц╤ndи≥r"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Evolution Hesab д╟darи≥cisi"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "%s da(dи≥) %s yazmд╠е÷dд╠r:"
+
+#~ msgid "Receiving"
+#~ msgstr "Alд╠nд╠r"
+
+#~ msgid "Store"
+#~ msgstr "Saxla"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Bunula baе÷layan qovluqlarд╠ gц╤stи≥r:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "\"%s\" ц╪ц╖ц╪n saxlama amи≥liyyatд╠ aparд╠lд╠r"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Evolution qurulmasд╠"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %e %B %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "д╟smarд╠larд╠n ц╖ap edilmи≥si bacarд╠lmadд╠"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Yeni и≥laqи≥"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "_ф▐laqи≥"
+
+#~ msgid "Go to present time"
+#~ msgstr "д╟ndiki vaxta get"
+
+#~ msgid "W_ork Week"
+#~ msgstr "д╟_е÷  hи≥ftи≥si"
+
+#~ msgid "_Day"
+#~ msgstr "_Gц╪n"
+
+#~ msgid "_Week"
+#~ msgstr "_Hи≥ftи≥"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Bu iclasд╠ qapat"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "ц┤ap Qurд÷ularд╠"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "д╟clasд╠ qeyd et vи≥ dialoqu qapat"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "_Gediе÷lи≥r"
+
+#~ msgid "Help"
+#~ msgstr "Kц╤mи≥k"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "ф▐laqи≥ni fи≥rqli yerи≥ gц╤_ndи≥r..."
+
+#~ msgid "See online help"
+#~ msgstr "Xи≥tdи≥ki Kц╤mи≥yи≥ bax"
+
+#~ msgid "Compose"
+#~ msgstr "Yaz"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Al_t Qeydlи≥ri д╟darи≥ Et..."
+
+#~ msgid "Show _All"
+#~ msgstr "_Hamд╠sд╠nд╠ Gц╤stи≥r"
+
+#, fuzzy
+#~ msgid "Print Message..."
+#~ msgstr "д╟smarд╠cд╠ ц╖ap et ..."
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "ц┤ap Etmи≥ nц╪mayiе÷i"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "д╟_smarд╠clarд╠ Yenidи≥n Gц╤ndи≥r"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Vasitи≥lи≥r ц┤ubuд÷unu _Xц╪susilи≥е÷dir..."
+
+#~ msgid "Customize"
+#~ msgstr "_Xц╪susilи≥е÷dir"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Vasitи≥lи≥r ц╖ubuд÷unu xц╪susilи≥е÷dir"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Bu vи≥zifи≥ni sil"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Vи≥zifи≥ni vи≥ baе÷qa е÷eylи≥ri dи≥ qeyd et"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Ne_cи≥ Baе÷layaram"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "ф▐_laqи≥lи≥r д╟darи≥cisini Necи≥ iе÷lи≥dim"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "_Tи≥qvimi Necи≥ д╟е÷lи≥dim"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "_ePoц╖t bц╤lmи≥sini necи≥ д╟е÷lи≥dim"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Gц╤rц╪е÷ (ABY)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_ф▐laqи≥lи≥r"
+
+#~ msgid "_Index"
+#~ msgstr "_д╟ndeks"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Mи≥ktub д╟smarд╠cд╠"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Vи≥zifи≥"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "_Mи≥ktub Qurд÷ularд╠..."
+
 #, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Seц╖и≥nи≥klи≥ri dи≥yiе÷dir"
@@ -12047,8 +14107,7 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ "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"
+#~ "qurub, Evolution'u yenidи≥n yoxlayд╠b yenidи≥n qurmaq mи≥cburiyyи≥tindи≥sи≥n.\n"
 
 #~ msgid "SASL"
 #~ msgstr "SASL"
@@ -12068,9 +14127,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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"
 
@@ -12089,9 +14145,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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"
 
@@ -12116,9 +14169,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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."
 
@@ -12184,12 +14234,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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"
 
@@ -12220,8 +14264,7 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 
 #~ 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 ."
+#~ "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"
@@ -12252,17 +14295,13 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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"
+#~ "д╟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"
 
@@ -12312,9 +14351,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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д╠."
 
@@ -12360,18 +14396,15 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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>"
+#~ "-----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>"
+#~ "-----ц┤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"
@@ -12403,9 +14436,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ msgid "Create a new calendar"
 #~ msgstr "Yeni bir tи≥qvim yarat"
 
-#~ msgid "Day"
-#~ msgstr "Gц╪n"
-
 #~ msgid "New _Event"
 #~ msgstr "Yeni _Hadisи≥"
 
@@ -12418,9 +14448,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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ц╖"
 
@@ -12436,9 +14463,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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)"
 
@@ -12481,9 +14505,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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..."
 
@@ -12517,12 +14538,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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"
 
@@ -12547,9 +14562,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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"
 
@@ -12599,9 +14611,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ msgid "_Reply"
 #~ msgstr "_Cavabla"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "д╟smarд╠clarд╠ _Fи≥rqli Qeyd Et ..."
-
 #~ msgid "_Threaded"
 #~ msgstr "_д╟lgи≥klи≥nmiе÷"
 
@@ -12614,12 +14623,6 @@ msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 #~ 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"
 
diff --git a/po/ca.po b/po/ca.po
index 80203ca752..2dd8013a7a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,10 +4,11 @@
 #
 # TraducciС per SoftcatalЮ <linux@softcatala.org>
 # Traductor original: VМctor Nieto <vnie2025@alu-etsetb.upc.es>
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -23,208 +24,208 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 #, fuzzy
 msgid "Card: "
 msgstr "Cotxe"
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "_Sufix:"
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "_AdreГa:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "PaМ_s:"
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "AdreГa electrРnica 2"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "AdreГa electrРnica 2"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Feina 2"
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "categories"
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 #, fuzzy
 msgid ""
 "\n"
@@ -241,13 +242,13 @@ msgstr "Comentaris sobre l'element:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 #, fuzzy
 msgid ""
 "\n"
@@ -268,8 +269,8 @@ msgstr "Si us plau, introduОu la contrasenya NNTP per a %s@%s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -284,20 +285,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС d'adreГa del Pilot"
 
@@ -353,216 +354,221 @@ msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
 msgid "Factory for the sample Addressbook control"
 msgstr "Feu clic aquМ per a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:148
-#, fuzzy
-msgid "LDAP Server"
-msgstr "Servidor LDAP:"
-
-#: addressbook/gui/component/addressbook-config.c:150
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
 #, fuzzy
-msgid "File"
-msgstr "_Fitxer"
+msgid "Contacts"
+msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-component.c:68
 #, 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)"
+msgid "Folder containing contact information"
 msgstr ""
+"Error en carregar la informaciС del filtre:\n"
+"%s"
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
-msgid "Unknown auth type"
-msgstr "Error desconegut"
+msgid "New Contact"
+msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-config.c:177
+#: addressbook/gui/component/addressbook-component.c:386
 #, fuzzy
-msgid "Base"
-msgstr "Enganxa"
+msgid "New _Contact"
+msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-component.c:387
 #, fuzzy
-msgid "Subtree"
-msgstr "Subscriu-me"
+msgid "New Contact _List"
+msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "contИ"
 
-#. 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.glade.h:3
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
+#: addressbook/gui/component/addressbook-config.glade.h:4
 #, fuzzy
-msgid "Host:"
-msgstr "Hores"
+msgid "Addressbook Sources"
+msgstr "Afegeix una font"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Afegeix..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "DN arrel:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#, fuzzy
+msgid "Base"
+msgstr "Enganxa"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Enganxa"
 
-#: addressbook/gui/component/addressbook-config.c:411
+#: addressbook/gui/component/addressbook-config.glade.h:8
 #, fuzzy
-msgid "Port:"
-msgstr "Prioritat:"
+msgid "De_lete"
+msgstr "Suprimeix"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:432
+#: addressbook/gui/component/addressbook-config.glade.h:10
 #, fuzzy
-msgid "Search Scope:"
+msgid "Search _base:"
 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
+#: addressbook/gui/component/addressbook-config.glade.h:11
 #, fuzzy
-msgid "Create path if it doesn't exist."
-msgstr "Aquest fitxer no existeix."
+msgid "Search s_cope: "
+msgstr "Cerca"
 
-#: addressbook/gui/component/addressbook-config.c:663
+#: addressbook/gui/component/addressbook-config.glade.h:12
 #, fuzzy
-msgid "Edit Addressbook"
-msgstr "Desa a la llibreta d'adreces"
+msgid "Server Name"
+msgstr "Servidor:"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/component/addressbook-config.glade.h:13
 #, fuzzy
-msgid "Add Addressbook"
-msgstr "Desa a la llibreta d'adreces"
+msgid "Sub"
+msgstr "Dg"
 
-#: addressbook/gui/component/addressbook-config.c:683
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 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"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
 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.glade.h:16
+msgid ""
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Afegeix una font"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
-msgid "De_lete"
-msgstr "Suprimeix"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr "Nom"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, fuzzy
-msgid "URI"
-msgstr "URL:"
+msgid "_Account name:"
+msgstr "contИ"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Edita"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr ""
+"No es pot connectar al servidor POP.\n"
+"No hi ha suport per al mecanisme d'autenticaciС sol╥licitat."
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Prioritat:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Servidor:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/addressbook.c:345
+#: addressbook/gui/component/addressbook.c:386
 #, fuzzy, c-format
-msgid "Enter password for %s"
-msgstr "Si us plau, introduОu la contrasenya NNTP per a %s@%s"
+msgid "Please enter your email address and password for access to %s"
+msgstr "Si us plau, introduОu la vostra contrasenya PGP/GPG."
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "AutenticaciС:"
+
+#: addressbook/gui/component/addressbook.c:405
+#, fuzzy
+msgid "Email Address:"
+msgstr "AdreГa electrРnica:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Contrasenya"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -570,51 +576,77 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos contИ"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 #, fuzzy
 msgid "Name contains"
 msgstr "contИ"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 #, fuzzy
 msgid "Email contains"
 msgstr "contИ"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "contИ"
+msgid "Category is"
+msgstr "categories"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+#, fuzzy
+msgid "Advanced..."
+msgstr "Afegeix..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "categories"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrarЮ el navegador de carpetes"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Sense nom)"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "AdreГa electrРnica 3"
 
@@ -638,20 +670,20 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "AdreГa electrРnica:"
@@ -675,13 +707,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Elimina"
 
@@ -695,38 +724,56 @@ msgstr "Elimina"
 msgid "Send HTML Mail?"
 msgstr "Sendmail"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Destinataris del missatge"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "contИ"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Seleccioneu els noms"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "_Contactes..."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "Seleccioneu un nom de la llista:"
+msgid "F_ind"
+msgstr "Cerca"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "Seleccioneu els noms"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "_Category:"
 msgstr "categories"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
-msgid "_Search"
-msgstr "Cerca"
+msgid "_Folder:"
+msgstr "_Carpeta"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Destinataris del missatge"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -741,8 +788,8 @@ msgid "Business _Fax"
 msgstr "Fax de la feina"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
@@ -751,16 +798,16 @@ msgid "Contact Editor"
 msgstr "Contacta l'editor"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Detalls"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Arxiva com:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "General"
 
@@ -785,243 +832,1246 @@ msgstr "Tipus de telХfon"
 msgid "Wants to receive _HTML mail"
 msgstr "Vol rebre correu _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "AdreГa de pЮgina web:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_AdreГa..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "_Nom de l'assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_Data de naixement:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Feina"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contactes..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Departament:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "Nom _complet..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_CЮrrec:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "_Nom del gestor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_MРbil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Oficina"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_ProfessiС:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_CРnjuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_Aquesta Иs l'adreГa de correu"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "AdreГa de pЮgina web:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Voleu suprimir el contacte?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "El(s) element(s) pertanyen a aquestes categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Feina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Feina 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Crida de retorn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Cotxe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "XDSI"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "MРbil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Altres"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Un altre fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Busca"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Primari"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "RЮdio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "TХlex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 #, fuzzy
 msgid "Edit Full"
 msgstr "Filtres d'ediciС"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 #, fuzzy
 msgid "E-mail"
 msgstr "AdreГa electrРnica 2"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "AdreГa _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Assistent"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Tria automЮtica"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "OrientaciС"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "agost"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "anys"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Mida"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "S'estЮ enviant \"%s\""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "_Correu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "CanadЮ"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Cotxe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Comprova l'adreГa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "_Fitxer"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Cotxe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Colors"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "S'estЮ copiant"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "PaМ_s:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "FinlЮndia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "EUA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Cancel╥lat"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+#, fuzzy
+msgid "Germany"
+msgstr "maig"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "setmana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "FinlЮndia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "CanadЮ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "General"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "_Correu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "Hores"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Diumenge"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+#, fuzzy
+msgid "Italy"
+msgstr "avui"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Baixa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Baixa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "abril"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#, fuzzy
+msgid "Lithuania"
+msgstr "vuitХ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "marГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "_Correu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "_Correu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "_Correu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#, fuzzy
+msgid "Martinique"
+msgstr "Minut"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Marges"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Dilluns"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Dilluns"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "MРbil"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Busca"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Recupera el correu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Selecciona'ls _tots"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Visualitza tots els contactes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Recupera el correu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Alta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "abril"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "Minut"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Ara"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Enganxa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "CanadЮ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Paper"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "FinlЮndia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Vertical"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "desprИs de"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Seccions:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "CanadЮ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "PuntuaciС"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "General"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "Seleccioneu una carpeta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "_Envia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "dg."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "_Sobrenom:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "FinlЮndia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Vist"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "RЮdio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tasques"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "FinlЮndia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Per a"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Avui"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "dm."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Tasca"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "CanadЮ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Mou el missatge"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Seleccioneu els noms"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Vist"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_AdreГa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_PoblaciС:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Apartat de correus:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Comarca:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_Codi postal:"
 
@@ -1114,6 +2164,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Elimina"
@@ -1124,7 +2175,7 @@ msgid "contact-list-editor"
 msgstr "Contacta l'editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Contacta l'editor"
@@ -1134,7 +2185,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1156,25 +2207,32 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "Contacte _nou"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
+#: widgets/misc/e-filter-bar.c:243
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Afegeix..."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Cerca"
 
@@ -1286,44 +2344,54 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Desa com a 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:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_Obre"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Send message to contact"
+msgid "Forward Contact"
+msgstr "Reenvia"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimeix el missatge..."
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Suprimeix"
 
@@ -1340,7 +2408,8 @@ 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
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -1349,7 +2418,7 @@ msgstr "Error desconegut"
 msgid "Repository offline"
 msgstr "S'estЮ movent"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "PermМs denegat"
 
@@ -1368,8 +2437,12 @@ msgid "Protocol not supported"
 msgstr "OperaciС no suportada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
 #, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancel╥lat"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1398,158 +2471,158 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<feu clic aquМ per seleccionar una data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 #, fuzzy
 msgid "File As"
 msgstr "Arxiva com:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 #, fuzzy
 msgid "Email"
 msgstr "AdreГa electrРnica 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Primari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 #, fuzzy
 msgid "Business Phone"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Crida de retorn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 #, fuzzy
 msgid "Home Phone"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "OrganitzaciС"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 #, fuzzy
 msgid "Business Address"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 #, fuzzy
 msgid "Home Address"
 msgstr "Comprova l'adreГa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "MРbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Other Phone"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Other Address"
 msgstr "Comprova l'adreГa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 #, fuzzy
 msgid "Department"
 msgstr "_Departament:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 #, fuzzy
 msgid "Title"
 msgstr "_TМtol:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 #, fuzzy
 msgid "Profession"
 msgstr "_ProfessiС:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 #, fuzzy
 msgid "Spouse"
 msgstr "_CРnjuge:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Cap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "Imprimeix l'agenda"
@@ -1747,6 +2820,23 @@ msgstr "Amplada:"
 msgid "_Font..."
 msgstr "Lletra..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Imprimeix l'agenda"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Imprimeix l'agenda"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Imprimeix el missatge..."
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1911,7 +3001,7 @@ msgstr ""
 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
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
@@ -1921,151 +3011,141 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 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
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-commands.c:586
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/calendar-commands.c:604
 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/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "PЗblic"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "PЗblic"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "O"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 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 "Transparent"
+#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "setmana"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Ocupat"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "En procИs"
 
-#: 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
 
-#: 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:893 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2076,27 +3156,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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 "Cap"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2106,44 +3166,51 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor de percentatge ha d'estar entre 0 i 100, ambdСs inclosos"
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr ""
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 #, fuzzy
 msgid "Recurring"
 msgstr "RecurrХncia"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigna una puntuaciС"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 #, fuzzy
 msgid "No"
 msgstr "Ara"
@@ -2168,30 +3235,90 @@ msgstr "Setmana"
 msgid "Month View"
 msgstr "Mes"
 
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Summary contains"
+msgstr "contИ"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "DescripciС:"
+
+#: calendar/gui/cal-search-bar.c:58
+#, fuzzy
+msgid "Comment contains"
+msgstr "contИ"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Agenda"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Tasques"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Filtre sobre la llista de correu"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Nova cita..."
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Create a new task"
+msgstr "Crea un nou contacte"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Tasca"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrarЮ l'agenda"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarmes acЗstiques"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Destinataris del missatge"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Opcions de visualitzaciС"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2244,123 +3371,129 @@ msgstr "hores"
 msgid "minutes"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "dies"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr "Mostra 1 dia"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr "Mostra 1 setmana"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr "hora"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr "10 minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " segons"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " segons"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Visualitza l'UID del missatge \"%s\""
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #, fuzzy
 msgid "Send an email"
 msgstr "S'estЮ recollint el correu des de %s"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 #, fuzzy
 msgid "Run a program"
 msgstr "_Executa el programa:"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, fuzzy
 msgid "after end of appointment"
 msgstr "Crea una nova 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -2369,12 +3502,11 @@ msgstr "Resum:"
 msgid "_Options..."
 msgstr "_Opcions"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "desprИs de"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "abans de"
 
@@ -2393,7 +3525,7 @@ msgstr "Recorda'm totes les cites"
 msgid "hour(s)"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
@@ -2412,204 +3544,225 @@ msgid "10 minutes"
 msgstr "10 minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 hores (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 hores"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minuts"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "_ParЮmetres"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Fes un so quan aparegui una finestra d'alarma."
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "Element per fer que venГ avui:"
 
 #: 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"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Crea una nova cita"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "PreferХncies de l'agenda"
+msgid "Days"
+msgstr "Dies"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "primer dia de la setmana:"
 
 #: 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/recurrence-page.c:969
+msgid "Friday"
+msgstr "Divendres"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
-msgid "Colors for Tasks"
-msgstr "Colors per a la visualitzaciС"
+msgid "Hours"
+msgstr "Hores"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#, fuzzy
-msgid "Compress weekends in month view"
-msgstr "Comprimeix els caps de setmana"
+msgid "Minutes"
+msgstr "Minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "Opcions del navegador de dates"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Dilluns"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Valors predeterminats"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Elements venГuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-#, fuzzy
-msgid "Display"
-msgstr "_VisualitzaciС"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "Dissabte"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Final del dia:"
+#, fuzzy
+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:19
-msgid "First day of week:"
-msgstr "primer dia de la setmana:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Mostra els nЗmeros de les setmanes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "dv."
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "Inici del dia:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Divendres"
+#, fuzzy
+msgid "Su_n"
+msgstr "dg."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Diumenge"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "dl."
+#, fuzzy
+msgid "T_hu"
+msgstr "dj."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Dilluns"
+#, fuzzy
+msgid "T_ue"
+msgstr "dm."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Elemts que vencen avui"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "Elements venГuts"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Dijous"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Recorda'm totes les cites"
+msgid "Time"
+msgstr "Temps"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr "Divisions de temps:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "ds."
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Divisions de temps:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "Dissabte"
+msgid "Time format:"
+msgstr "Format de l'hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#, fuzzy
-msgid "Show appointment end times in week and month views"
-msgstr "Mostra les hores d'acabament de les cites"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Dimarts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Mostra els nЗmeros de les setmanes"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Dimecres"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "Inici del dia:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "Setmana de treball"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "dg."
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 hores (AM/PM)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Diumenge"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 hores"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "Tasques"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "Elemts que vencen avui"
+msgid "_Compress weekends in month view"
+msgstr "Comprimeix els caps de setmana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "dj."
+#, fuzzy
+msgid "_Display"
+msgstr "_VisualitzaciС"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Dijous"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Final del dia:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Time"
-msgstr "Temps"
+#, fuzzy
+msgid "_Fri"
+msgstr "dv."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Divisions de temps:"
+#, fuzzy
+msgid "_General"
+msgstr "General"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Format de l'hora:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Suprimeix el missatge"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr "Divisions de temps:"
+msgid "_Mon"
+msgstr "dl."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "dm."
+#, fuzzy
+msgid "_Other"
+msgstr "Altres"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Dimarts"
+#, fuzzy
+msgid "_Sat"
+msgstr "ds."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "dc."
+#, fuzzy
+msgid "_Task List"
+msgstr "Tasques"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Dimecres"
+#, fuzzy
+msgid "_Wed"
+msgstr "dc."
 
 #: 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:49
-msgid "minutes before they occur."
-msgstr "minuts abans que es produeixin."
+msgid "before the start of the appointment"
+msgstr "Crea una nova cita"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2680,64 +3833,59 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2745,13 +3893,13 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2818,43 +3966,36 @@ msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Fitxer de signatura:"
+msgid "Addressbook..."
+msgstr "Desa a la llibreta d'adreces"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "Seccions:"
+msgid "Delegate To:"
+msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 #, fuzzy
-msgid "Time Zones"
-msgstr "Divisions de temps:"
-
-#: 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 ""
+msgid "Enter Delegate"
+msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 #, fuzzy
 msgid "Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "RecurrХncia"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancel╥lat"
@@ -2863,177 +4004,193 @@ msgstr "Cancel╥lat"
 msgid "A_ll day event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Ocupat"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "ClassificaciС"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Confidencial"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Date & Time"
 msgstr "Data d'enviament"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "setmana"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "PЗ_blic"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Mostra"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "Resu_m:"
 
-#: 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
+#: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
 msgid "_End time:"
 msgstr "Hora de _finalitzaciС:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "Grup %i"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "Font"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
 msgid "Chair"
 msgstr "Cotxe"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, fuzzy
 msgid "Required Participant"
 msgstr "Persones _requerides"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 msgid "Needs Action"
 msgstr "Elimina una acciС"
 
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, fuzzy
 msgid "Accepted"
 msgstr "set"
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, fuzzy
 msgid "Declined"
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/meeting-page.c:644
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentatiu"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "En procИs"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Persones _requerides"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Persones _requerides"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Persones _requerides"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Vist"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Suprimeix"
@@ -3078,21 +4235,20 @@ msgid "Role"
 msgstr "MРbil"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Status"
 msgstr "_Estat:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 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:"
@@ -3140,14 +4296,15 @@ msgstr "mes"
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
-msgstr "RecurrХncia personalitzada"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "A_dd"
+msgstr "Afegeix"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3158,27 +4315,34 @@ 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 "Preview"
 msgstr "PrevisualitzaciС:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Regla de recurrХncia"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "RecurrХncia simple"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "RecurrХncia personalitzada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Modifica"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Sense recurrХncia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "RecurrХncia simple"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "per a"
@@ -3220,174 +4384,169 @@ 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 "Delegated From:"
-msgstr "Suprimeix"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% comp_let:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "Suprimeix"
+msgid "Date Completed:"
+msgstr "Data completa:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #, fuzzy
-msgid "No one"
-msgstr "Cap"
+msgid "Progress"
+msgstr "En procИs"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Tasca"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_Prioritat:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% comp_let:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Estat:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
 #, fuzzy
-msgid "Progress"
-msgstr "En procИs"
+msgid "Assignment"
+msgstr "Assigna una puntuaciС"
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "DescripciС:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "Data d'ini_ci:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Data de venciment:"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "_Prioritat:"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "_Estat:"
-
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Personalitzat"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "_Copy"
 msgstr "Copia"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "_Paste"
 msgstr "Enganxa"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1137
+#: calendar/gui/e-calendar-table.c:1130
 #, fuzzy
-msgid "Click here to add a task"
+msgid "Click to add a task"
 msgstr "Feu clic aquМ per a la llibreta d'adreces"
 
-#: 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 "Alarmes"
@@ -3425,26 +4584,25 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioritat"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Start Date"
 msgstr "Data d'ini_ci:"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
 msgid "Task sort"
 msgstr "Tasques"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-#, fuzzy
-msgid "Transparency"
-msgstr "Transparent"
-
 #: calendar/gui/e-calendar-table.etspec.h:18
 #, fuzzy
 msgid "URL"
@@ -3457,158 +4615,264 @@ msgstr "%02i divisions de minut"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "VИs a avui"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "VИs a una data"
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix-ne aquesta apariciС"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "_Aquesta Иs l'adreГa de correu"
+msgid "Meeting Information"
+msgstr "Cap informaciС"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 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:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Cancel╥lat"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Hora de _finalitzaciС de la reuniС:"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "FIXME: Pe_ticiС de cita"
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "_Aquesta Иs l'adreГa de correu"
+
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
-msgid "The message is not understandable."
+msgid "Meeting Reply"
+msgstr "Cancel╥lat"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 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."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Fitxer de signatura:"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "_Edita el missatge"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Cap informaciС"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "TaskPad"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "ha estat desprИs de"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "FIXME: _PeticiС de tasca"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Respon"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:691
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Cancel╥lat"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Agenda"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Cap informaciС"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Cap informaciС"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Imprimeix el missatge"
+
+#: calendar/gui/e-itip-control.c:940
 #, fuzzy
 msgid "I couldn't update your calendar file!\n"
 msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Data completa:"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "No s'ha pogut crear una agenda a `%s'"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% comp_let:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Data d'enviament"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
@@ -3652,47 +4916,29 @@ msgstr ""
 msgid "date-start"
 msgstr "Inici del dia:"
 
-#: 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
-#, fuzzy
-msgid "Category:"
-msgstr "categories"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El mХtode necessari per carregar `%s' no estЮ suportat"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c: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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, 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:1010
+#: calendar/gui/gnome-cal.c:1271
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El mХtode necessari per carregar `%s' no estЮ suportat"
@@ -3724,50 +4970,50 @@ 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:7
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
 msgid "July"
 msgstr "juliol"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
 msgid "June"
 msgstr "juny"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "March"
 msgstr "marГ"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
 msgid "May"
 msgstr "Dilluns"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
 msgid "November"
 msgstr "novembre"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 #, fuzzy
 msgid "October"
 msgstr "octubre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "VИs a avui"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3923,12 +5169,6 @@ msgstr "Dv"
 msgid "Sa"
 msgstr "Ds"
 
-#: 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:1815
 #, fuzzy
@@ -3965,9 +5205,8 @@ msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "PrevisualitzaciС d'impressiС"
 
@@ -3981,7 +5220,7 @@ msgstr "Imprimeix aquest element"
 msgid "Print Setup"
 msgstr "ConfiguraciС de la pЮgina:"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrarЮ l'agenda"
@@ -4019,6 +5258,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DDDDDDD"
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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"
@@ -4084,7 +5419,7 @@ msgid "Unable to process spool folder"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
 #: camel/camel-filter-driver.c:667
-#, fuzzy
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'estЮ escrivint el missatge %d de %d"
 
@@ -4123,7 +5458,7 @@ msgstr "Error en desar el fitxer: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
@@ -4150,12 +5485,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -4189,8 +5524,8 @@ msgstr "No s'ha pogut crear el fitxer de blocatge per a %s: %s"
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
-"S'ha excedit el temps mЮxim en intentar recuperar el fitxer de blocatge en "
-"%s. Torneu-ho a provar mИs tard."
+"S'ha excedit el temps mЮxim en intentar recuperar el fitxer de blocatge en %"
+"s. Torneu-ho a provar mИs tard."
 
 #: camel/camel-lock.c:201
 #, c-format
@@ -4271,13 +5606,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "No s'ha indicat cap contrasenya."
 
 #: 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
@@ -4295,15 +5630,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4339,7 +5674,7 @@ msgid "Connection cancelled"
 msgstr "Cancel╥lat"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
@@ -4350,7 +5685,7 @@ msgstr "(ordinador central desconegut)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
@@ -4411,8 +5746,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per "
-"autenticar-vos-hi."
+"AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per autenticar-"
+"vos-hi."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -4461,8 +5796,8 @@ msgstr ""
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per "
-"autenticar-vos-hi."
+"AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per autenticar-"
+"vos-hi."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, fuzzy, c-format
@@ -4493,42 +5828,69 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "AutenticaciС:"
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Contrasenya"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Font"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: 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:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de camМ"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'estЮ comprovant \"%s\""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4541,12 +5903,12 @@ msgstr "ProveОdor de correu de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, 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:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4593,7 +5955,7 @@ msgstr "Missatge de _correu (FIXME)"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4601,7 +5963,7 @@ msgid ""
 msgstr "Assumpte"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4647,52 +6009,52 @@ msgstr ""
 "NomИs podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 #, 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:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, 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:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, 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:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, 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
+#: camel/providers/imap/camel-imap-folder.c:209
 #, 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:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
@@ -4700,12 +6062,12 @@ msgstr ""
 "Aquest missatge no tИ cap assumpte.\n"
 "Voleu que l'enviО igualment?"
 
-#: camel/providers/imap/camel-imap-folder.c:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "CРpia de missatges"
@@ -4719,7 +6081,7 @@ msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 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
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Comprova si hi ha nou correu"
@@ -4729,7 +6091,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Carpetes"
 
@@ -4773,7 +6135,7 @@ msgstr ""
 "No hi ha suport per al mecanisme d'autenticaciС sol╥licitat."
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "AutenticaciС:"
@@ -4784,7 +6146,7 @@ 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:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -4799,12 +6161,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4899,7 +6261,7 @@ msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4913,7 +6275,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
@@ -4988,20 +6350,20 @@ msgstr "No es pot obrir la bЗstia de correu temporal: %s"
 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-mbox-folder.c:209
 #: 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"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -5013,12 +6375,12 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
@@ -5067,13 +6429,13 @@ msgstr "La carpeta `%s' no Иs buida. No s'ha suprimit."
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing folder"
 msgstr "S'estЮ sincronitzant \"%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"
+msgid "Could not open folder: %s: summarizing 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:296
@@ -5083,25 +6445,22 @@ 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"
+msgid "Cannot summarize folder: %s: %s"
 msgstr "No es pot bifurcar %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:1516
+#: camel/providers/local/camel-spool-summary.c:931
 #, fuzzy
-msgid "Synchronising folder"
+msgid "Synchronizing folder"
 msgstr "S'estЮ sincronitzant \"%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"
+msgid "Could not open folder to summarize: %s: %s"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
@@ -5209,6 +6568,19 @@ msgstr "Les carpetes Mbox no es poden imbricar."
 msgid "Spool folders cannot be deleted"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5299,40 +6671,40 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, 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
+#: camel/providers/pop3/camel-pop3-folder.c:235
 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: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:296
-#, fuzzy, c-format
-msgid "Retrieving POP message %d"
-msgstr "S'estan recuperant els missatges : %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "No hi ha cap missatge amb l'uid %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "S'estan recuperant els missatges : %s"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 #, fuzzy
 msgid "Message storage"
@@ -5348,7 +6720,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:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5383,8 +6755,8 @@ msgstr ""
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
-"AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per "
-"autenticar-vos-hi."
+"AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per autenticar-"
+"vos-hi."
 
 #: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
@@ -5443,7 +6815,7 @@ msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5499,7 +6871,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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
@@ -5510,132 +6882,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:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Help message"
 msgstr "Mou el missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 #, fuzzy
 msgid "Service ready"
 msgstr "Amaga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 #, 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:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "AutenticaciС:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 #, fuzzy
 msgid "Authentication required"
 msgstr "AutenticaciС:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5646,130 +7018,130 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, 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:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "AutenticaciС:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, 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:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, 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
+#: camel/providers/smtp/camel-smtp-transport.c:850
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5799,7 +7171,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "adjunciС"
 
@@ -5832,21 +7204,21 @@ msgstr "Tipus de MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Feu clic aquМ per a la llibreta d'adreces"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -5854,31 +7226,31 @@ msgstr "Respon"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "IntroduОu els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "нntroduОu les adreces que rebran una cРpia del missatge"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5909,73 +7281,73 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "S'estЮ movent"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, 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:1061
+#: composer/e-msg-composer.c:1057
 #, 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
+#: composer/e-msg-composer.c:1063
 #, 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
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5985,25 +7357,25 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "FIXME: Insereix el fitxer..."
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
@@ -6033,59 +7405,100 @@ msgstr "AdreГa"
 msgid "calendar information"
 msgstr "Cap informaciС"
 
+#: default_user/searches.xml.h:1
+msgid "Body contains"
+msgstr "El cos contИ"
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr "El cos no contИ"
+
+#: default_user/searches.xml.h:3
+msgid "Body or subject contains"
+msgstr "El cos o l'assumpte contenen"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "contИ"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Destinataris"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "contИ"
+
+#: default_user/searches.xml.h:7
+msgid "Subject contains"
+msgstr "L'assumpte contИ"
+
+#: default_user/searches.xml.h:8
+msgid "Subject does not contain"
+msgstr "L'assumpte no contИ"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 #, 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 #, 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %d/%m/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -6093,14 +7506,14 @@ 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
+#: e-util/e-time-utils.c:313
 #, 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
+#: e-util/e-time-utils.c:322
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -6199,7 +7612,7 @@ msgstr "una hora relativa a l'actual"
 msgid "Compare against"
 msgstr "Compara-la amb"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "ara"
 
@@ -6212,11 +7625,16 @@ msgstr "fa"
 msgid "ago"
 msgstr "fa"
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<feu clic aquМ per seleccionar una data>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Regles del filtre"
 
@@ -6235,20 +7653,20 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "IntroduОu l'URI de la carpeta"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<feu clic aquМ per seleccionar una carpeta>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6269,70 +7687,59 @@ msgstr "Nom de la regla: "
 msgid "Untitled"
 msgstr "Sense tМtol"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 #, fuzzy
 msgid "incoming"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 #, 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Filtres d'ediciС"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Edita les VFolders"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 #, fuzzy
 msgid "Incoming"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 #, fuzzy
 msgid "Outgoing"
 msgstr "Contorn:"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Carpetes virtuals"
 
@@ -6358,206 +7765,207 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Crea una carpeta nova"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Assigna un color"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Assigna una puntuaciС"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "adjunciС"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contИ"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Data de recepciС"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Deleted"
 msgstr "Suprimeix"
 
-#: 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
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Draft"
 msgstr "Data de venciment"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "acaba amb"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "existeix"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "ExpressiС"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "Иs"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "Иs mИs gran que"
-
-#: 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
+#: filter/libfilter-i18n.h:15
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "S'ha rebut el missatge"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "S'ha enviat el missatge"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: 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
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Read"
 msgstr "RЮdio"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "PuntuaciС"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexiС"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Mida"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Source Account"
 msgstr "contИ"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Especifiqueu la capГalera"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "comenГa per"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Assumpte"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "contИ"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "no contИ"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "no comenГa per"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "acaba amb"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "existeix"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "Иs mИs gran que"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "Иs mИs petit que"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "no Иs"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "Иs"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "el o desprИs del"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "el o abans del"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "comenГa per"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "ha estat desprИs de"
@@ -6590,14 +7998,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "_Correu"
@@ -6624,12 +8031,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "_ParЮmetres"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6693,188 +8100,207 @@ msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
 msgid "Mail configuration interface"
 msgstr "ConfiguraciС del correu"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Filtre sobre la llista de correu"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "Propietats..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propietats de la llista de coses per fer"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "FIXME: Missatge de _correu"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "FIXME: Missatge de _correu"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'intХrpret d'ordres"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: mail/folder-browser.c:893
+#: mail/folder-browser.c:909
 #, fuzzy
-msgid "Store search as vFolder"
-msgstr "Seleccioneu una carpeta"
+msgid "Create vFolder from Search"
+msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1273
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "Resend"
-msgstr "segon"
+msgid "_Edit as New Message..."
+msgstr "_Anomena i desa..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Suprimeix"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Cap informaciС"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6939,17 +8365,17 @@ 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
+#: mail/mail-account-editor.c:163
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6960,37 +8386,41 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 #, fuzzy
 msgid " (default)"
 msgstr "Valors predeterminats"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 #, fuzzy
 msgid "Disable"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Suprimeix"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
@@ -6998,9 +8428,10 @@ msgstr ""
 "suprimir aquest contacte?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr ""
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "_ParЮmetres"
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -7054,11 +8485,11 @@ msgstr ""
 "Cal que configureu un transport de correu\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap mХtode de transport de correu"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -7066,7 +8497,7 @@ msgstr ""
 "Aquest missatge no tИ cap assumpte.\n"
 "Voleu que l'enviО igualment?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -7074,43 +8505,42 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 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:410
+#: mail/mail-callbacks.c:390
 #, 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:653
-#, c-format
-msgid "On %s, %s wrote:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, 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
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -7118,7 +8548,7 @@ msgstr ""
 "NomИs podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -7127,29 +8557,47 @@ msgstr ""
 "NomИs podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+#, fuzzy
+msgid "Warning"
+msgstr "S'estЮ movent"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Envia aquest missatge"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -7158,142 +8606,153 @@ msgstr ""
 "Error en carregar la informaciС del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de correu ..."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressiС del missatge"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, 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
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, c-format
+msgid "%s: Inbox"
+msgstr ""
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "ConnexiС de prova a \"%s\""
 
 #: mail/mail-config.glade.h:1
 #, fuzzy
-msgid " Check for supported types "
-msgstr "Detecta els tipus suportats..."
-
-#: mail/mail-config.glade.h:2
-#, fuzzy
 msgid " color"
 msgstr "Colors"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, 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
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "Account"
 msgstr "contИ"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informaciС"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Accounts"
 msgstr "contИ"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "adjunciС"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Authentication"
 msgstr "AutenticaciС:"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "AutenticaciС:"
 
-#: 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:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "Redacta"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -7306,318 +8765,392 @@ msgstr ""
 "Ja teniu enllestida la configuraciС del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous parЮmetres"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Display"
+msgstr "_VisualitzaciС"
+
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 #, fuzzy
 msgid "Drafts"
 msgstr "Data de venciment"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "CreaciС d'una nova carpeta"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Edita..."
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "E_nable"
+msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:31
 #, fuzzy
-msgid "Email Address:"
-msgstr "AdreГa electrРnica:"
+msgid "Each account must have a different name."
+msgstr "l'hora actual"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Edita..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:40
-#, fuzzy
-msgid "Full Name:"
-msgstr "Nom complet:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:43
-#, fuzzy
-msgid "Highlight citations with"
-msgstr "Ressalta els elemts que vencen avui"
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "Visualitza en lМnia"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "ConfiguraciС del correu"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
+#: mail/mail-config.glade.h:44
+msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
-#, fuzzy
-msgid "Mark messages as Read after"
-msgstr "Marca el missatge com a vist [ms]: "
-
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "News"
 msgstr "Nou"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informaciС"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "OrganitzaciС:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Prompt when sending messages with an empty subject"
+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:58
+#, fuzzy
+msgid "Prompt when sending messages with only _Bcc recipients defined"
+msgstr "S'estЮ afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "AdreГa electrРnica 2"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Data de recepciС"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "Cap informaciС"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Secure MIME"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: 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:87
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Sent"
 msgstr "Vist"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Server Configuration"
 msgstr "ConfiguraciС del correu"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
-msgstr ""
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
+msgstr "AutenticaciС:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Font"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Cap informaciС"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Fonts"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
+#: mail/mail-config.glade.h:86
+msgid "Use secure connection (_SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:87
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "Comprova si hi ha nou correu"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr "Detecta els tipus suportats..."
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "AdreГa electrРnica:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Nom complet:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "Ressalta els elemts que vencen avui"
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "Hores"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
 #: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+msgid "_Log filter actions to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Nom d'usuari:"
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "Marca el missatge com a vist [ms]: "
 
 #: mail/mail-config.glade.h:105
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
+#, fuzzy
+msgid "_Name:"
+msgstr "Nom:"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "OrganitzaciС:"
+
+#: mail/mail-config.glade.h:108
+msgid "_PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "CamМ:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
 msgstr ""
 
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Desa com a VCard"
+
 #: mail/mail-config.glade.h:112
 #, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Envia els missatges en format HTML"
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Nom d'usuari:"
+
+#: mail/mail-config.glade.h:116
+#, fuzzy
 msgid "newswindow1"
 msgstr "finestra1"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "segons."
 
@@ -7666,191 +9199,202 @@ msgstr "No s'ha pogut crear el quadre de diЮleg."
 msgid "Could not create a S/MIME decode context."
 msgstr "No s'ha pogut crear el quadre de diЮleg."
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Desa l'adjunciС"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Desa al disc..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Visualitza en lМnia"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en lМnia (mitjanГant %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 #, fuzzy
 msgid "Loading message content"
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Contacte (FIXME)"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Suprimeix"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " segons"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunciС"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "AdreГa electrРnica:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "Respon"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Per a"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "No hi ha cap programa GPG/PGP disponible."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Esborra la visualitzaciС del missatge"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Edita el missatge"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "La carpeta `%s' no existeix."
+
+#: mail/mail-local.c:460
 #, fuzzy, c-format
-msgid "Opening '%s'"
+msgid "Registering '%s'"
 msgstr "Obre a %s..."
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'estЮ convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7859,7 +9403,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:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7867,11 +9411,11 @@ msgstr ""
 "Si ja no podeu obrir aquesta bЗstia de correu\n"
 "potser us caldrЮ reparar-la manualment."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "_Configura la carpeta"
@@ -7894,221 +9438,241 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
+#: mail/mail-mt.c:796
 #, fuzzy
 msgid "Working"
 msgstr "S'estЮ movent"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Fi_ltre sobre el remitent"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Sendmail"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'estЮ enviant \"%s\""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'estЮ escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'estЮ marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "CРpia de missatges"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "S'estЮ movent"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "S'estЮ copiant"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 #, fuzzy
 msgid "Trash"
 msgstr "Tasca"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Sincronitza \"%s\""
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'estЮ esborrant \"%s\""
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "CРpia de missatges"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, 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:1913
+#: mail/mail-ops.c:1947
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunciС"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, 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:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "S'estЮ recollint el correu des de %s"
 
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Cerca"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Sense tМtol)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Mou el missatge"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "_Edita el missatge"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "_Edita el missatge"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "Reenvia"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "Cerca"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "CamМ:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Cancel╥lat"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:253
-#, fuzzy
-msgid "Receiving"
-msgstr "Data de recepciС"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "_ParЮmetres"
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "_ParЮmetres"
 
-#: mail/mail-send-recv.c:323
-#, fuzzy
-msgid "Sending"
-msgstr "S'estЮ enviant \"%s\""
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel╥lat"
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Consulta cancel╥lada per l'usuari."
@@ -8128,92 +9692,97 @@ msgstr "Missatge reenviat - %s"
 msgid "Forwarded message"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Reenvia el missatge"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Re: (sense assumpte)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "_Missatge"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: 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:915
+#: mail/message-list.c:938
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "CРpia de missatges"
 
 #: mail/message-list.etspec.h:2
@@ -8229,42 +9798,80 @@ msgstr "Data de recepciС"
 msgid "Size"
 msgstr "Mida"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/subscribe-dialog.c:275
+#, fuzzy, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/subscribe-dialog.c:277
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
+
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
 
-#: mail/subscribe-dialog.c:77
+#: mail/subscribe-dialog.c:1490
 #, fuzzy
-msgid "Store"
-msgstr "PuntuaciС"
+msgid "No server has been selected"
+msgstr "S'ha rebut el missatge"
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
 
-#: mail/subscribe-dialog.c:138
+#: mail/subscribe-dialog.glade.h:1
 #, fuzzy
-msgid "Display folders starting with:"
-msgstr "Visualitza les carpetes que continguin:"
+msgid " _Refresh List "
+msgstr "Refresca la llista"
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Carpetes"
 
-#: mail/subscribe-dialog.c:271
-#, fuzzy, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "S'estan escanejant les carpetes de \"%s\""
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Opcions de visualitzaciС"
 
-#: mail/subscribe-dialog.c:273
-#, fuzzy, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.glade.h:5
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Gestiona les subscripcions..."
 
+#: mail/subscribe-dialog.glade.h:6
+#, fuzzy
+msgid "Show _folders from server: "
+msgstr "Mostra la barra de _carpetes"
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Subscriu-me"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Cancel╥la la subscripciС"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
 msgid "Evolution component for the executive summary."
@@ -8276,57 +9883,74 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 #, fuzzy
 msgid "Appointments"
 msgstr "Cites:"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%I:%M %p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%I:%M %p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Sense resum"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Afegeix un servidor de notМcies"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Nom:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Instal╥laciС de l'Evolution"
+msgid "Summary Settings"
+msgstr "_ParЮmetres"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8337,7 +9961,12 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr "Error en carregar el fitxer: %s"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Servidors de notМcies"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Mostra les _adjuncions"
@@ -8346,28 +9975,33 @@ msgstr "Mostra les _adjuncions"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Altres"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Seccions:"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %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"
+msgid "Print Summary"
+msgstr "R_esum"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "Ha fallat la impressiС del missatge"
 
 #: my-evolution/main.c:52
@@ -8375,6 +10009,42 @@ msgstr "Ha fallat la impressiС del missatge"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Lletres"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "S'estЮ movent"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Filtres de correu ..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Filtres de correu ..."
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9563,125 +11233,139 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Afegeix un servidor de notМcies"
+msgid " _Remove"
+msgstr "Elimina"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Carpetes"
+msgid "Add n_ew feed"
+msgstr "Afegeix un servidor de notМcies"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Tots els assistents"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "Tots els assistents"
+msgid "All _folders:"
+msgstr "Carpetes"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Visualitza les carpetes que continguin:"
+msgid "All news _feeds:"
+msgstr "Afegeix un servidor de notМcies"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Opcions de visualitzaciС"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "_VisualitzaciС"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "Divendres"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "mes"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "Mostra 1 setmana"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Mostra les _adjuncions"
 
 #: my-evolution/my-evolution.glade.h:14
 #, fuzzy
-msgid "News Feeds"
-msgstr "Servidors de notМcies"
+msgid "Show _today's tasks"
+msgstr "Mostra les _adjuncions"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "Dimecres"
+msgid "Tasks "
+msgstr "Tasques"
 
 #: my-evolution/my-evolution.glade.h:16
-#, fuzzy
-msgid "One month"
-msgstr "mes"
+msgid "Units: "
+msgstr ""
 
 #: 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 ""
+msgid "Weather settings"
+msgstr "ParЮmetres de prova"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr "Seleccioneu una carpeta"
+msgid "_Display folders:"
+msgstr "Visualitza les carpetes que continguin:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Mostra les _adjuncions"
+msgid "_Display stations:"
+msgstr "Opcions de visualitzaciС"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "Mostra en aquest ordre"
+msgid "_Displayed feeds:"
+msgstr "_VisualitzaciС"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Mostra les _adjuncions"
+msgid "_Five days"
+msgstr "Divendres"
 
 #: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "Tasks "
-msgstr "Tasques"
+msgid "_Mail"
+msgstr "_Correu"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
-msgstr ""
+#, fuzzy
+msgid "_News Feeds"
+msgstr "Servidors de notМcies"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Altres"
+msgid "_One day"
+msgstr "Dimecres"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "ParЮmetres de prova"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "abril"
+msgid "_Schedule"
+msgstr "Seleccioneu una carpeta"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "Mostra en aquest ordre"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Altres"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "abril"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9699,7 +11383,15 @@ msgstr "Detalls"
 msgid "Cancel Operation"
 msgstr "Cancel╥lat"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-local-storage.c:178
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Carpetes virtuals"
@@ -9755,7 +11447,7 @@ msgid ""
 "`%s'."
 msgstr "S'ha produОt un error en llegir el fitxer."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9766,7 +11458,7 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal╥laciС\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9775,7 +11467,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9786,59 +11478,83 @@ msgstr ""
 "de l'Evolution. Si us plau, moveu-lo per permetre\n"
 "la instal╥laciС dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "No es pot bifurcar %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, 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
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copia a la carpeta"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Mou a la carpeta"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"No s'ha pogut suprimir la carpeta `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Suprimeix la tasca"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, 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
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Nom de la regla: "
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nom del fitxer:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9852,7 +11568,7 @@ msgstr ""
 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:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea una nova carpeta"
 
@@ -9864,11 +11580,11 @@ 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:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Sense tМtol)"
 
@@ -9898,7 +11614,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9944,7 +11660,7 @@ msgstr "Tria automЮtica"
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
@@ -9954,33 +11670,56 @@ msgstr "Fitxer de signatura:"
 msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr ""
+"No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 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:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9990,89 +11729,105 @@ msgstr ""
 "per a correu, agenda i gestiС de contactes\n"
 "dins de l'entorn d'escriptori GNOME."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "VИs a la carpeta..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, 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
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Work Offline"
 msgstr "S'estЮ movent"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#. 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
+#: shell/e-shell-view.c:1459
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1311
+#: shell/e-shell.c:1438
 #, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 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:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:1644
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "No es pot registrar l'emmagatzemament amb l'intХrpret d'ordres"
+
+#: shell/e-shell.c:1648
+#, fuzzy
+msgid "Configuration Database not found"
+msgstr "ConfiguraciС del correu"
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Error genХric"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -10081,184 +11836,170 @@ msgstr ""
 "Esteu segur que voleu eliminar el grup\n"
 "`%s' de la barra de dreceres?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "No l'eliminis"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "Icones _petites"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra les dreceres com a icones petites"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "Icones _grans"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra les dreceres com a icones grans"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Nou grup..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Obre'l en una nova finestra"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Mostra la barra de _dreceres"
 
-#: 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:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Sense nom)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Error genХric"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no Иs vЮlid"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "FunciС no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "OperaciС no suportada"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "No s'ha trobat la carpeta indicada"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% comp_let:"
 
@@ -10280,11 +12021,6 @@ msgstr "Hores"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#, fuzzy
-msgid "Folder name:"
-msgstr "Nom del fitxer:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder type:"
@@ -10301,18 +12037,27 @@ msgstr ""
 
 #: shell/importer/import.glade.h:2
 #, fuzzy
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Utility"
+msgid "Evolution Importer Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Fitxer de signatura:"
+
 #: 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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -10332,10 +12077,10 @@ msgid "Don't ask me again"
 msgstr "Envia aquest missatge"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10373,7 +12118,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
 "ansiosament les vostres contribucions!\n"
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10381,25 +12126,30 @@ msgstr ""
 "GrЮcies\n"
 "L'equip de l'Evolution\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "No es pot inicialitzat l'intХrpret d'ordres de l'Evolution."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "No es pot inicialitzat l'intХrpret d'ordres de l'Evolution."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 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-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Copia"
 
@@ -10418,12 +12168,12 @@ msgstr "Crea un nou contacte"
 msgid "Create new contact list"
 msgstr "Crea un nou contacte"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 #, fuzzy
 msgid "Cut"
 msgstr "Personalitzat"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Cut the selection"
 msgstr "_Inverteix la selecciС"
@@ -10433,85 +12183,128 @@ msgstr "_Inverteix la selecciС"
 msgid "Delete selected contacts"
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:10
-#, fuzzy
-msgid "New contact"
-msgstr "Visualitza tots els contactes"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Nou"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Enganxa"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Imprimeix els contactes"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "Suprimeix un contacte"
+
+#: ui/evolution-addressbook.xml.h:21
 #, fuzzy
 msgid "Select All"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "FIXME: Nou _missatge per contactar"
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "Suprimeix un contacte"
+
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "FIXME: Nou _missatge per contactar"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "Mou un missatge a una nova carpeta"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Atura"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Atura la cЮrrega"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "_Accions"
+
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Afegeix una font"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contactes..."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Contactes..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Desa com a VCard"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Cerca contactes"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 #, 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Eines"
 
@@ -10521,123 +12314,139 @@ 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
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Crea una nova cita"
+msgid "Create a New _Task"
+msgstr "Crea un nou contacte"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crea una nova cita"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Create an event for the whole day"
 msgstr "Crea una nova cita per a avui"
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "Dia"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Suprimeix aquesta cita"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "VИs a"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "VИs enrera en el temps"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "VИs endavant en el temps"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to _Date"
 msgstr "VИs a una data"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "VИs a una data concreta"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "VИs al present"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "VИs a avui"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "Mes"
+
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "New Appointment"
 msgstr "Nova cita..."
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 #, fuzzy
-msgid "Previews the calendar to be printed"
-msgstr "Previsualitza el missatge que s'ha d'imprimir"
+msgid "New Task"
+msgstr "Tasca"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
-msgid "Print calendar"
-msgstr "Imprimeix l'agenda"
+msgid "Previews the calendar to be printed"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 #, fuzzy
-msgid "Print this Calendar"
-msgstr "Imprimeix aquest agenda"
+msgid "Print Pre_view"
+msgstr "PrevisualitzaciС d'impressiС"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "Cap informaciС"
+msgid "Print this calendar"
+msgstr "_Imprimeix aquest agenda"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Mostra 1 dia"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Mostra 1 mes"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Mostra 1 setmana"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
-msgid "W_ork Week"
-msgstr "Setmana de treball"
+msgid "Week"
+msgstr "Setmanes"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "Cites:"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "_ParЮmetres"
 
-#: ui/evolution-calendar.xml.h:32
-#, fuzzy
-msgid "_Day"
-msgstr "Dia"
-
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:41
 #, fuzzy
-msgid "_Month"
-msgstr "Mes"
+msgid "_Publish Free/Busy Information"
+msgstr "Cap informaciС"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
-msgid "_Week"
-msgstr "Setmana"
+msgid "_Task..."
+msgstr "Tasca"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10650,15 +12459,15 @@ msgstr "Tanca"
 
 #: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
-msgid "Close this appointment"
-msgstr "Suprimeix aquesta cita"
+msgid "Close this item"
+msgstr "Suprimeix aquest element"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Suprimeix aquesta cita"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Suprimeix aquest element"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr ""
 
@@ -10667,123 +12476,87 @@ msgstr ""
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimeix..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Desa"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Desa i tanca"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
+msgid "Save the item and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diЮleg"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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"
-
-#: ui/evolution-contact-editor.xml.h:4
-#, fuzzy
-msgid "Help"
-msgstr "_Ajuda"
-
 #: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Imprimeix el missatge..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diЮleg"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Consulta l'ajuda en lМnia"
-
-#: ui/evolution-contact-editor.xml.h:13
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "FIXME: Nou _missatge per contactar"
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Desa"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Suprimeix aquest element"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+#, fuzzy
+msgid "Delete..."
+msgstr "Suprimeix"
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diЮleg"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "_Invita a altres..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "FIXME: Nou _missatge per contactar"
@@ -10793,21 +12566,21 @@ msgstr "FIXME: Nou _missatge per contactar"
 msgid "Cancel Mee_ting"
 msgstr "Cancel╥lat"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Reenvia aquest missatge"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10821,16 +12594,11 @@ msgstr "Refresca la llista"
 msgid "Schedule _Meeting"
 msgstr "Seleccioneu una carpeta"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "Seleccioneu una carpeta"
 
-#: 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-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10847,71 +12615,67 @@ msgid "Cancel the current mail operation"
 msgstr "l'hora actual"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Redacta"
-
-#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "Redacta un nou missatge"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "Dies buits:"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Oblida les _contrasenyes"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:10
 #, fuzzy
-msgid "Manage _Subscriptions..."
-msgstr "Gestiona les subscripcions..."
+msgid "New Message"
+msgstr "_Missatge"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Sendmail"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Editor de carpetes _virtuals..."
@@ -10941,102 +12705,112 @@ msgstr "PrevisualitzaciС:"
 msgid "_Send / Receive"
 msgstr "Sendmail"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Personalitzat"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Suprimeix el missatge"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Mar_ca'l com a llegit"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, 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
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
 msgid "Select _Thread"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 #, fuzzy
-msgid "Show _All"
+msgid "Sh_ow Hidden Messages"
 msgstr "Mostra"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Llista de missatges en cadena"
 
@@ -11044,7 +12818,7 @@ msgstr "Llista de missatges en cadena"
 msgid "_Expunge"
 msgstr "_Esborra"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -11052,12 +12826,12 @@ msgstr "_Carpeta"
 msgid "_Invert Selection"
 msgstr "_Inverteix la selecciС"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
 msgid "_Properties..."
 msgstr "Propietats..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Llista de missatges en cadena"
@@ -11313,7 +13087,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "Imprimeix el missatge seleccionat"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11336,43 +13111,37 @@ msgstr "Imprimeix el missatge"
 msgid "Previous Unread Message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Imprimeix el missatge..."
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "PrevisualitzaciС d'impressiС"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Respon"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Respon a tots"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "Anomena i desa..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
@@ -11423,77 +13192,59 @@ msgstr "VFolder sobre els destinata_ris"
 msgid "VFolder on _Subject..."
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Reenvia el missatge"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Esborra la visualitzaciС del missatge"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "_VisualitzaciС"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Edita el missatge"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "_Edita el missatge"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close this window"
 msgstr "Suprimeix aquesta cita"
 
-#: 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
-#, fuzzy
-msgid "Customize"
-msgstr "Cerca personalitzada"
-
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Close"
 msgstr "Tanca"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Visualitza"
 
@@ -11563,11 +13314,6 @@ 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 "Desa"
-
 #: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
@@ -11719,7 +13465,7 @@ msgstr "Respon"
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -11753,15 +13499,28 @@ msgstr "Cancel╥la la subscripciС"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "_Tasca (FIXME)"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "Tasca"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Suprimeix la tasca"
+msgid "Cancel this task"
+msgstr "Tasca"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "Refresca la llista"
@@ -11770,47 +13529,32 @@ msgstr "Refresca la llista"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Obre la tasca"
 
-#: ui/evolution-tasks.xml.h:4
-#, fuzzy
-msgid "Create a new task"
-msgstr "Crea un nou contacte"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Suprimeix la tasca"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "Suprimeix la tasca"
 
-#: ui/evolution-tasks.xml.h:8
-#, fuzzy
-msgid "New Task"
-msgstr "Tasca"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "_ParЮmetres"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Task"
 msgstr "Tasca"
@@ -11849,194 +13593,172 @@ msgstr "Elimina aquesta drecera de la barra de dreceres"
 msgid "Create a new folder"
 msgstr "CreaciС d'una nova carpeta"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Suprimeix aquest element"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Mostra una altra carpeta"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "S_urt"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "Per _comenГar"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "Obre'l en una nova finestra"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Mostra informaciС referent a l'Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "Submit Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:25
 #, fuzzy
-msgid "Submit bug report using Bug Buddy."
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia un informe d'error mitjanГant el Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Toggle"
 msgstr "MРbil"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuta la visualitzaciС o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuta la visualitzaciС o no de la barra de dreceres"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 #, 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:35
-msgid "Using the _Calendar"
-msgstr "UtilitzaciС de l'_agenda"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "UtilitzaciС del _gestor de correu"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Visualitza la carpeta seleccionada"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (FIXME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Contacte (FIXME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copia"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_VИs a la carpeta..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:42
 #, fuzzy
-msgid "_Import file..."
+msgid "_Import File..."
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "_мndex"
-
-#: ui/evolution.xml.h:54
-#, fuzzy
-msgid "_Mail message"
-msgstr "Missatge de _correu (FIXME)"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "Mou"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Tanca..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 #, 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
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "S'estЮ movent"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr ""
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr "Sense resum"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "RЮdio"
+
+#: ui/my-evolution.xml.h:6
+#, fuzzy
+msgid "Reload the view"
+msgstr "Reconstrueix la visualitzaciС del missatge"
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
 msgstr "_ParЮmetres"
 
 #: views/addressbook/galview.xml.h:1
@@ -12079,6 +13801,28 @@ msgstr "_Missatge"
 msgid "With Category"
 msgstr "categories"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Fitxer de signatura:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Seccions:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "Divisions de temps:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -12086,10 +13830,6 @@ msgstr "categories"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Ocupat"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
@@ -12163,7 +13903,7 @@ msgstr "Tots els assistents"
 msgid "_Current View"
 msgstr "l'hora actual"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -12173,19 +13913,20 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr "DDDDDDD"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Ara"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Avui"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -12274,41 +14015,36 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "Contacta l'editor"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 #, fuzzy
 msgid "Save Search"
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.c:241
+#: widgets/misc/e-filter-bar.h:94
 #, fuzzy
-msgid "Advanced Search"
-msgstr "Afegeix..."
+msgid "Add to Saved Searches"
+msgstr "Cerca"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Agenda"
 
 #: widgets/misc/e-filter-bar.h:102
 #, fuzzy
 msgid "Show All"
 msgstr "Mostra"
 
-#: widgets/misc/e-filter-bar.h:104
-#, fuzzy
-msgid "Advanced..."
-msgstr "Afegeix..."
-
 #: widgets/misc/e-messagebox.c:152
 #, fuzzy
 msgid "Information"
 msgstr "Cap informaciС"
 
-#: widgets/misc/e-messagebox.c:159
-#, fuzzy
-msgid "Warning"
-msgstr "S'estЮ movent"
-
 #: widgets/misc/e-messagebox.c:166
 #, fuzzy
 msgid "Error"
@@ -12330,11 +14066,16 @@ msgstr "_Missatge"
 msgid "Don't show this message again."
 msgstr "Envia aquest missatge"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 #, fuzzy
 msgid "Sear_ch"
 msgstr "Cerca"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "finestra2"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -12360,6 +14101,278 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "R_esum"
+
+#, fuzzy
+#~ msgid "LDAP Server"
+#~ msgstr "Servidor LDAP:"
+
+#, fuzzy
+#~ msgid "Unknown addressbook type"
+#~ msgstr "No es pot obrir la llibreta d'adreces"
+
+#, fuzzy
+#~ msgid "Unknown auth type"
+#~ msgstr "Error desconegut"
+
+#, fuzzy
+#~ msgid "Subtree"
+#~ msgstr "Subscriu-me"
+
+#~ msgid "Root DN:"
+#~ msgstr "DN arrel:"
+
+#~ msgid "Authentication:"
+#~ msgstr "AutenticaciС:"
+
+#, fuzzy
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Aquest fitxer no existeix."
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#, fuzzy
+#~ msgid "URI"
+#~ msgstr "URL:"
+
+#, fuzzy
+#~ msgid "Enter password for %s"
+#~ msgstr "Si us plau, introduОu la contrasenya NNTP per a %s@%s"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "contИ"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "Seleccioneu un nom de la llista:"
+
+#~ msgid "USA"
+#~ msgstr "EUA"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Cancel╥lat"
+
+#~ msgid "Transparent"
+#~ msgstr "Transparent"
+
+#~ msgid "Opaque"
+#~ msgstr "Opac"
+
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 hores (am/pm)"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Fes un so quan aparegui una finestra d'alarma."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "PreferХncies de l'agenda"
+
+#, fuzzy
+#~ msgid "Colors for Tasks"
+#~ msgstr "Colors per a la visualitzaciС"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "Opcions del navegador de dates"
+
+#~ msgid "Defaults"
+#~ msgstr "Valors predeterminats"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Recorda'm totes les cites"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minuts abans que es produeixin."
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Suprimeix"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Cap"
+
+#~ msgid "Task"
+#~ msgstr "Tasca"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% comp_let:"
+
+#, fuzzy
+#~ msgid "Transparency"
+#~ msgstr "Transparent"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr ""
+#~ "Aquest missatge no tИ cap assumpte.\n"
+#~ "Voleu que l'enviО igualment?"
+
+#~ msgid "Edit"
+#~ msgstr "Edita"
+
+#, fuzzy
+#~ msgid "Store search as vFolder"
+#~ msgstr "Seleccioneu una carpeta"
+
+#, fuzzy
+#~ msgid "Resend"
+#~ msgstr "segon"
+
+#, fuzzy
+#~ msgid "Receiving"
+#~ msgstr "Data de recepciС"
+
+#, fuzzy
+#~ msgid "Store"
+#~ msgstr "PuntuaciС"
+
+#, fuzzy
+#~ msgid "Display folders starting with:"
+#~ msgstr "Visualitza les carpetes que continguin:"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Instal╥laciС de l'Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %d de %B de %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Ha fallat la impressiС del missatge"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "New contact"
+#~ msgstr "Visualitza tots els contactes"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "_Contactes..."
+
+#~ msgid "Go to present time"
+#~ msgstr "VИs al present"
+
+#, fuzzy
+#~ msgid "Print this Calendar"
+#~ msgstr "Imprimeix aquest agenda"
+
+#, fuzzy
+#~ msgid "W_ork Week"
+#~ msgstr "Setmana de treball"
+
+#, fuzzy
+#~ msgid "_Day"
+#~ msgstr "Dia"
+
+#, fuzzy
+#~ msgid "_Week"
+#~ msgstr "Setmana"
+
+#, fuzzy
+#~ msgid "Close this appointment"
+#~ msgstr "Suprimeix aquesta cita"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "ConfiguraciС de la pЮgina:"
+
+#, fuzzy
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Desa el contacte i tanca el quadre de diЮleg"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "_Accions"
+
+#, fuzzy
+#~ msgid "Help"
+#~ msgstr "_Ajuda"
+
+#~ msgid "See online help"
+#~ msgstr "Consulta l'ajuda en lМnia"
+
+#~ msgid "Compose"
+#~ msgstr "Redacta"
+
+#, fuzzy
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Gestiona les subscripcions..."
+
+#, fuzzy
+#~ msgid "Show _All"
+#~ msgstr "Mostra"
+
+#, fuzzy
+#~ msgid "Print Message..."
+#~ msgstr "Imprimeix el missatge..."
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "PrevisualitzaciС d'impressiС"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "_Edita el missatge"
+
+#, fuzzy
+#~ msgid "Customize"
+#~ msgstr "Cerca personalitzada"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Suprimeix la tasca"
+
+#, fuzzy
+#~ msgid "Save task as something else"
+#~ msgstr "Deixa l'agenda com a alguna altra cosa"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Per _comenГar"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "UtilitzaciС del gestor de c_ontactes"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "UtilitzaciС de l'_agenda"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "UtilitzaciС del _gestor de correu"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Cita (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contacte (FIXME)"
+
+#~ msgid "_Index"
+#~ msgstr "_мndex"
+
+#, fuzzy
+#~ msgid "_Mail message"
+#~ msgstr "Missatge de _correu (FIXME)"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "_ParЮmetres"
+
+#, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Modifica les preferХncies"
 
@@ -12411,9 +14424,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ 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"
 
@@ -12432,9 +14442,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Overdue Items:"
 #~ msgstr "Elements que ja han venГut:"
 
-#~ msgid "TaskPad"
-#~ msgstr "TaskPad"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Temps fins al venciment"
 
@@ -12463,10 +14470,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Edita la tasca"
 
 #, fuzzy
-#~ msgid "Go to Today"
-#~ msgstr "VИs a avui"
-
-#, fuzzy
 #~ msgid "Delete all Occurrences"
 #~ msgstr "Suprimeix-ne totes les aparicions"
 
@@ -12606,10 +14609,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "%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"
@@ -12680,9 +14679,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ 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)"
 
@@ -12716,9 +14712,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "Crea una nova agenda"
 
-#~ msgid "Day"
-#~ msgstr "Dia"
-
 #, fuzzy
 #~ msgid "New _Event"
 #~ msgstr "Nova a_genda"
@@ -12754,10 +14747,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "FIXME: _Llibreta d'adreces..."
 
 #, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Agenda"
-
-#, fuzzy
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "_Tasca (FIXME)"
 
@@ -12847,10 +14836,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Crea un nou contacte"
 
 #, fuzzy
-#~ msgid "New Mail"
-#~ msgstr "Recupera el correu"
-
-#, fuzzy
 #~ msgid "Configure Folder..."
 #~ msgstr "Mou a la carpeta"
 
@@ -12866,10 +14851,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Reenvia un missatge sense cap assumpte"
 
 #, fuzzy
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "Suprimeix el missatge"
-
-#, fuzzy
 #~ msgid "Invert Selection"
 #~ msgstr "_Inverteix la selecciС"
 
@@ -12911,10 +14892,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Reply"
 #~ msgstr "Respon"
 
-#, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "_Anomena i desa..."
-
 #~ msgid "_Threaded"
 #~ msgstr "_En cadena"
 
@@ -12930,14 +14907,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ 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"
 
@@ -12998,11 +14967,11 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
 #~ 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 ""
-#~ "Aquesta opciС es connectarЮ al servidor IMAP mitjanГant una contrasenya de "
-#~ "text net."
+#~ "Aquesta opciС es connectarЮ al servidor IMAP mitjanГant una contrasenya "
+#~ "de text net."
 
 #~ msgid "No such host %s."
 #~ msgstr "L'ordinador central %s no existeix."
@@ -13025,18 +14994,18 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
 #~ msgid ""
-#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
-#~ "also be used to retrieve mail from certain web mail providers and "
+#~ "For connecting to POP servers over an SSL connection. The POP protocol "
+#~ "can also be used to retrieve mail from certain web mail providers and "
 #~ "proprietary email systems."
 #~ msgstr ""
-#~ "Per connectar als servidors POP. El protocol POP tambИ es pot utilitzar per "
-#~ "recuperar correu des de determinats proveОdors de correu web i sistemes "
-#~ "propietaris de correu."
+#~ "Per connectar als servidors POP. El protocol POP tambИ es pot utilitzar "
+#~ "per recuperar correu des de determinats proveОdors de correu web i "
+#~ "sistemes propietaris de correu."
 
 #, fuzzy
 #~ msgid ""
-#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-#~ "connection.\n"
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an "
+#~ "SSL connection.\n"
 #~ msgstr ""
 #~ "Per al lliurament de correu mitjanГant la connexiС a un concentrador de "
 #~ "correu utilitzant SMTP."
@@ -13060,10 +15029,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Unspecified"
 #~ msgstr "Especifiqueu la capГalera"
 
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Afegeix..."
-
 #~ msgid "Email address:"
 #~ msgstr "AdreГa electrРnica:"
 
@@ -13084,18 +15049,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "contИ"
 
 #, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "ConfiguraciС del correu"
-
-#, fuzzy
-#~ msgid "Password:"
-#~ msgstr "Contrasenya"
-
-#, fuzzy
-#~ msgid "Remember my password"
-#~ msgstr "Desa com a VCard"
-
-#, fuzzy
 #~ msgid "Reply address:"
 #~ msgstr "AdreГa electrРnica:"
 
@@ -13108,10 +15061,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Desa com a VCard"
 
 #, fuzzy
-#~ msgid "Server type:"
-#~ msgstr "Servidor:"
-
-#, fuzzy
 #~ msgid "Transport"
 #~ msgstr "Transparent"
 
@@ -13146,8 +15095,8 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
 #~ msgstr ""
-#~ "Per llegir el correu lliurat al sistema local i per emmagatzemar correu en "
-#~ "el disc local."
+#~ "Per llegir el correu lliurat al sistema local i per emmagatzemar correu "
+#~ "en el disc local."
 
 #, fuzzy
 #~ msgid "Connect to server"
@@ -13283,21 +15232,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "Edita una regla de la VFolder"
 
-#~ msgid "Body or subject contains"
-#~ msgstr "El cos o l'assumpte contenen"
-
-#~ msgid "Body contains"
-#~ msgstr "El cos contИ"
-
-#~ msgid "Subject contains"
-#~ msgstr "L'assumpte contИ"
-
-#~ msgid "Body does not contain"
-#~ msgstr "El cos no contИ"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "L'assumpte no contИ"
-
 #~ msgid "You have no Outbox configured"
 #~ msgstr "No teniu configurada cap bЗstia de sortida"
 
@@ -13365,8 +15299,8 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid ""
 #~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
 #~ msgstr ""
-#~ "No s'ha pogut llegir el fitxer de la memРria cau UID \"%s\". иs possible que "
-#~ "rebeu missatges duplicats."
+#~ "No s'ha pogut llegir el fitxer de la memРria cau UID \"%s\". иs possible "
+#~ "que rebeu missatges duplicats."
 
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "S'estЮ recuperant el missatge %d de %d"
@@ -13394,9 +15328,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "FIXME: _Task"
 #~ msgstr "FIXME: _Tasca"
 
-#~ msgid "FIXME: Task _Request"
-#~ msgstr "FIXME: _PeticiС de tasca"
-
 #~ msgid "FIXME: _Journal Entry"
 #~ msgstr "FIXME: Entrada al _diari"
 
@@ -13558,24 +15489,12 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "task-editor-dialog"
 #~ msgstr "task-editor-dialog"
 
-#~ msgid "Days"
-#~ msgstr "Dies"
-
-#~ msgid "Hours"
-#~ msgstr "Hores"
-
 #~ msgid "Mail _to:"
 #~ msgstr "Envia per correu _a:"
 
-#~ msgid "Minutes"
-#~ msgstr "Minuts"
-
 #~ msgid "_Audio"
 #~ msgstr "_юudio"
 
-#~ msgid "_Mail"
-#~ msgstr "_Correu"
-
 #~ msgid "_Program"
 #~ msgstr "_Programa"
 
@@ -13586,10 +15505,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "etiqueta21"
 
 #, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Suprimeix"
-
-#, fuzzy
 #~ msgid "Hide Subject"
 #~ msgstr "Assumpte"
 
@@ -13609,13 +15524,13 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Respon"
 
 #~ 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 ""
 #~ "IntroduОu el vostre nom i adreГa electrРnica que es farЮ servir al correu "
-#~ "desortida. Podeu, opcionalment, introduir el nom de la vostra organitzaciС, "
-#~ "iel nom d'un fitxer d'on llegir la vostra signatura."
+#~ "desortida. Podeu, opcionalment, introduir el nom de la vostra "
+#~ "organitzaciС, iel nom d'un fitxer d'on llegir la vostra signatura."
 
 #~ msgid "Full name:"
 #~ msgstr "Nom complet:"
@@ -13627,11 +15542,11 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Tipus de font del correu:"
 
 #~ 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 ""
 #~ "Seleccioneu el tipus de servidor de correu que teniu, i introduОu-ne la "
 #~ "informaciС corresponent.\n"
@@ -13643,11 +15558,11 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Tipus de font de notМcies:"
 
 #~ 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 ""
 #~ "Seleccioneu el tipus del vostre servidor de notМcies, i introduОu-ne la "
 #~ "informaciС corresponent.\n"
@@ -13659,10 +15574,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
 #~ 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 ""
 #~ "Seleccioneu el tipus de servidor de correu que teniu, i introduОu-ne la "
 #~ "informaciС corresponent.\n"
@@ -13717,9 +15632,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Open a calendar"
 #~ msgstr "Obre una agenda"
 
-#~ msgid "_Print this calendar"
-#~ msgstr "_Imprimeix aquest agenda"
-
 #~ msgid "FIXME: Chec_k Names"
 #~ msgstr "FIXME: Comp_rova els noms"
 
@@ -13744,19 +15656,12 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Redo"
 #~ msgstr "RЮdio"
 
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Fi_ltre sobre el remitent"
-
 #~ msgid "Filter on Rec_ipients"
 #~ msgstr "Filtre sobre els dest_inataris"
 
 #~ msgid "Reply to _Sender"
 #~ msgstr "Respon al _remitent"
 
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Mostra"
-
 #~ msgid "_Filter on Subject"
 #~ msgstr "_Filtre sobre l'assumpte"
 
@@ -13806,9 +15711,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "Element endarrerit encara per fer:"
 
-#~ msgid "may"
-#~ msgstr "maig"
-
 #~ msgid "sunday"
 #~ msgstr "diumenge"
 
@@ -13857,9 +15759,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "yesterday"
 #~ msgstr "ahir"
 
-#~ msgid "today"
-#~ msgstr "avui"
-
 #~ msgid "this"
 #~ msgstr "aquest"
 
@@ -13930,7 +15829,8 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Reenvia el missatge \"%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 ""
 #~ "No s'ha pogut generar la part mime del missatge en generar el missatge "
 #~ "reenviat."
@@ -13952,9 +15852,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "ExcepciС en informar del resultat a l'escoltador de components de "
 #~ "l'intХrpret d'ordres."
 
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Sincronitza \"%s\""
-
 #~ msgid "Displaying message UID \"%s\""
 #~ msgstr "S'estЮ visualitzant l'UID del missatge \"%s\""
 
@@ -13983,9 +15880,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Rebuilding message view"
 #~ msgstr "S'estЮ reconstruint la visualitzaciС del missatge"
 
-#~ msgid "Rebuild message view"
-#~ msgstr "Reconstrueix la visualitzaciС del missatge"
-
 #~ msgid "N_ew Directory Server"
 #~ msgstr "N_ou servidor de directori"
 
@@ -13999,9 +15893,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "BLARG\n"
 #~ msgstr "BLARG\n"
 
-#~ msgid "window2"
-#~ msgstr "finestra2"
-
 #~ msgid "Recur on the"
 #~ msgstr "Repeteix-ho el dia"
 
@@ -14015,8 +15906,8 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "However, the appointment will recur at the appropriate time and will be "
 #~ "displayed properly in the calendar views."
 #~ msgstr ""
-#~ "Aquesta cita tИ regles de recurrХncia personalitzades que l'Evolution no pot "
-#~ "editar.\n"
+#~ "Aquesta cita tИ regles de recurrХncia personalitzades que l'Evolution no "
+#~ "pot editar.\n"
 #~ "\n"
 #~ "No obstant aixР, la cita recurrirЮ en el moment oportЗ i es visualitzarЮ "
 #~ "correctament en les vistes de l'agenda."
@@ -14036,9 +15927,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Time format"
 #~ msgstr "Format de l'hora"
 
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 hores (AM/PM)"
-
 #~ msgid "24-hour"
 #~ msgstr "24 hores"
 
@@ -14118,10 +16006,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "matches regex"
 #~ msgstr "coincideix amb la regex"
 
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr ""
-#~ "No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
-
 #~ msgid "Bad storage URL (no server): %s"
 #~ msgstr "URL d'emmagatzemament incorrecte (cap servidor): %s"
 
@@ -14208,15 +16092,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "To-do list"
 #~ msgstr "Llista de coses per fer"
 
-#~ msgid "Weeks"
-#~ msgstr "Setmanes"
-
 #~ msgid "Hour"
 #~ msgstr "Hora"
 
-#~ msgid "Minute"
-#~ msgstr "Minut"
-
 #~ msgid "Second"
 #~ msgstr "Segon"
 
@@ -14268,9 +16146,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Currently pending operations:"
 #~ msgstr "Operacions encara pendents:"
 
-#~ msgid "Show _folder bar"
-#~ msgstr "Mostra la barra de _carpetes"
-
 #~ msgid "Help _index"
 #~ msgstr "_мndex de l'ajuda"
 
diff --git a/po/da.po b/po/da.po
index 1173af9982..e912dca898 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,10 +3,11 @@
 # Kenneth Christiansen <kenneth@gnome.dk>, 2000.
 # Keld Simonsen <keld@dkuug.dk>, 2000.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution beta\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -22,11 +23,11 @@ msgstr "Fabrik til at importere VKort-filer ind i Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importerer VKort-filer ind i Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -34,7 +35,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -42,7 +43,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -50,7 +51,7 @@ msgstr ""
 "\n"
 "Opgivet:     "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -58,7 +59,7 @@ msgstr ""
 "\n"
 "TillФg: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -66,7 +67,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -74,7 +75,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -82,7 +83,7 @@ msgstr ""
 "\n"
 "FЬdselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -90,7 +91,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -98,7 +99,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -106,7 +107,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -114,7 +115,7 @@ msgstr ""
 "\n"
 "Vej:     "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -122,7 +123,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -130,7 +131,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -138,7 +139,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -146,7 +147,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -154,7 +155,7 @@ msgstr ""
 "\n"
 "LeveringsmФrke: "
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -162,7 +163,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -170,7 +171,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -178,7 +179,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -186,7 +187,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -194,7 +195,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -202,7 +203,7 @@ msgstr ""
 "\n"
 "Tidszone: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -210,7 +211,7 @@ msgstr ""
 "\n"
 "Geografisk lokation: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -218,7 +219,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -226,7 +227,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -234,7 +235,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -242,7 +243,7 @@ msgstr ""
 "\n"
 "Enhed:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -250,7 +251,7 @@ msgstr ""
 "\n"
 "Enhed2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -258,7 +259,7 @@ msgstr ""
 "\n"
 "Enhed3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -266,7 +267,7 @@ msgstr ""
 "\n"
 "Enhed4: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -274,7 +275,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -292,7 +293,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -300,7 +301,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -321,8 +322,8 @@ msgstr "VKort for %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -337,20 +338,20 @@ msgstr "MarkЬren kunne ikke indlФses\n"
 msgid "EBook not loaded\n"
 msgstr "EBook ikke indlФst\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lФse pilotens adresseapplikationsblok"
 
@@ -398,203 +399,213 @@ msgstr "Fabrik for Evolutions adressebog-komponent."
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "_Kontakt"
 
-#: 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-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Fejl ved indlФsning af filter information:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Ukendt auth type"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "иn"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "UndertrФ"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Ukendt omrЕde-type"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "RedigИr adressebog"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr ""
 
-#: 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.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Konto"
 
-#. 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.glade.h:3
+msgid "Add Addressbook"
+msgstr "TilfЬj adressebog"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "VФrt:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Kilder til adressebog"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Avanceret..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Rod-DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Port:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "Slet"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "иn"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 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.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "SЬgeomrЕde:"
 
-#: 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.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "Tjenertype:"
 
-#: 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.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "sЬn"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "RedigИr adressebog"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "TilfЬj adressebog"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"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"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Kilder til adressebog"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "Kontoadministration"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_RedigИr"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Server krФver autentificering"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Tjenertype:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 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:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Indtast venligst din %s adgangskode for %s"
+
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Godkendelse"
+
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "Epostadresse:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Adgangskode"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke Еbne adressebogen"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -602,48 +613,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Hvilkensomhelst felt indeholder"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Navn indeholder"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "Epost indeholder"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "Navn indeholder"
+msgid "Category is"
+msgstr "Kategorier"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avanceret..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Kategori:"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "Uri'en som mappebladreren 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
+#, fuzzy
+msgid "(none)"
+msgstr "(Uden navn)"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "TertiФr epost"
 
@@ -667,19 +703,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "RedigИr adressebog"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "RedigИr kontaktinfo"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "FЬj til kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Epostadresse:"
@@ -701,13 +737,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Fjern"
 
@@ -720,37 +753,56 @@ msgstr "Fjern alt"
 msgid "Send HTML Mail?"
 msgstr "Sender post"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Modtagerliste:"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "indeholder"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "VФlg mappe"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "_Kontakt"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "VФlg navn fra:"
+msgid "F_ind"
+msgstr "Find"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "VФlg mappe"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, 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/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "_Mappe"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Modtagerliste:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -765,8 +817,8 @@ msgid "Business _Fax"
 msgstr "_Fax pЕ arbejde"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -775,16 +827,16 @@ msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Detaljer"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Gem som:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Generel"
 
@@ -809,239 +861,1243 @@ msgstr "Telefontyper"
 msgid "Wants to receive _HTML mail"
 msgstr "Vil modtage epost af formatet _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Hjemmeside-adresse:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Adresse..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "SekretФrs navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_FЬdselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Arbejde"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Slet"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Afdeling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Fulde navn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Hjemme"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_Job titel:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "_Leders navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "Kalde_navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Kontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Profession:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "фgte_fФlle:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_Dette er postadressen"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Hjemmeside-adresse:"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt tilhЬrer disse kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "SekretФr"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Arbejde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Arbejde 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Firma fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Tilbagering"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Hjem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Hjem 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Hjemme fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "Isdn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Andet"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Anden fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Kalder"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "PrimФr epost"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Kunne ikke slette oversigtsfil `%s': %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "RedigИr alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Fuldt navn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "E-post"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "SekretФr"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Automatisk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Orientering"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "august"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "Еr"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "StЬrrelse"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Sender"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Epost"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Formand"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Tjek adresse"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Foresatte"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Foresatte"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Farver"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "KopiИrer"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "AnnullИr"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+#, fuzzy
+msgid "Germany"
+msgstr "dag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "uge"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr " "
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Generel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Epost"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "timer"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "sЬndag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+#, fuzzy
+msgid "Italy"
+msgstr "Dag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Lavest"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Lavest"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "april"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#, fuzzy
+msgid "Lithuania"
+msgstr "HЬjde:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "marts"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Epost"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Epost"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Epost"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Marginer"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "maj"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "mandag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "_Mobil"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Foresatte"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Nyt post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "VФlg _trЕd"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Ny kontakt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nyt post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "HЬjere"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "april"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minut"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Nu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "IndsФt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "PortrФt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "efter"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Sektioner:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Point"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Generel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr ""
+"AfsФt\n"
+"tid"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Afsend"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "sЬn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Kaldenavn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "LФst"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Radio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Opgaver"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Modtager"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "I dag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "tir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Papirkurv"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "(Unavngivet besked)"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "VФlg mappe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "LФst"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_By:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
@@ -1132,6 +2188,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Fjern"
@@ -1142,7 +2199,7 @@ msgid "contact-list-editor"
 msgstr "Kontaktredigering"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Kontaktredigering"
@@ -1152,7 +2209,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1174,26 +2231,31 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
+msgid "Change Anyway"
+msgstr "Foresatte"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
 msgid "Changed Contact:"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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 "Foresatte"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "Avanceret sЬgning"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "SЬg"
 
@@ -1305,45 +2367,53 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gem som vCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "еbn"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Send contact to other"
-msgstr "Send _kontaktperson til andre..."
+msgid "Forward Contact"
+msgstr "Vis bilag"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
-msgid "Send message to contact"
+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: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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Udskriv"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Skriv kuvert..."
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Slet"
 
@@ -1360,7 +2430,8 @@ 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
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
@@ -1369,7 +2440,7 @@ msgstr "Ukendt fejl"
 msgid "Repository offline"
 msgstr "Arbejd uden net"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Adgang nФgtet"
 
@@ -1388,8 +2459,11 @@ msgid "Protocol not supported"
 msgstr "Operationen er ikke understЬttet"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "Afbrudt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1418,144 +2492,144 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr "Fejl under indlФsning af %s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Klik her for at tilfЬje en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "Epost"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 #, fuzzy
 msgid "Primary Phone"
 msgstr "PrimФr epost"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "SekretФr"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 #, fuzzy
 msgid "Business Phone"
 msgstr "Arbejde 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Tilbagering"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "Firma"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 #, fuzzy
 msgid "Home Phone"
 msgstr "Hjem 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 #, fuzzy
 msgid "Business Address"
 msgstr "Arbejde 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "_Mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Arbejde 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Hjem 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Other Phone"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Anden adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Websted"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Afdeling"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Foresatte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Samlever"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "BemФrkning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "Ledig-optaget URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "FФrdig"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "IndlФser kalender..."
@@ -1752,6 +2826,23 @@ msgstr "Bredde:"
 msgid "_Font..."
 msgstr "Skrifttype..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Udskriv kalender"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Udskriv kalender"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Skriv kuvert..."
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1908,7 +2999,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere Gnome"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere Bonobo"
@@ -1917,151 +3008,142 @@ msgstr "Kunne ikke initiere Bonobo"
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A den %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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A den %e. %B %Y"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %b"
 
-#: calendar/gui/calendar-commands.c:586
+#: calendar/gui/calendar-commands.c:604
 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:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "Of_fentlig"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "_Fortrolig"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "Of_fentlig"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "ь"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "V"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "HЬj"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Lav"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "uge"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Optaget"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "Under udarbejdelse"
 
-#: 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "FuldfЬrt"
 
-#: 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:893 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2072,29 +3154,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:981
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-"Klassifikationen skal vФre en af 'Offentlig', 'Privat', \"Fortrolig' eller "
-"'Ingen'"
-
-#. 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 "Ingen"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2104,44 +3164,49 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ProcentvФrdien skal vФre mellem 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioriteten skal vФre en af 'HЬj', 'Normal', 'Lav' eller 'Udefineret'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: 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'."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Gentages"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Nej"
 
@@ -2165,30 +3230,88 @@ msgstr "Uge"
 msgid "Month View"
 msgstr "MЕned"
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "Sammendrag indeholder"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "Beskrivelse:"
+
+#: calendar/gui/cal-search-bar.c:58
+#, fuzzy
+msgid "Comment contains"
+msgstr "Navn indeholder"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Kalender"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Opgaver"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "vMappe efter diskussionsliste"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Opret en ny aftale"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Ny aftale"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Opret en ny opgave"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Ny opgave"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Lyd-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Modtagerliste:"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Vis valgmuligheder"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2241,121 +3364,127 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d dage"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr " 1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d uger"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr " 1 uge"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d timer"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 time"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minut"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d sekunder"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " 1 sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "KЬ_r program"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Ukendt fejl"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr " fЬr begyndelse pЕ aftale"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr " efter begyndelse pЕ aftale"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr " fЬr slutning pЕ aftale"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -2364,12 +3493,11 @@ msgstr "Sammendrag:"
 msgid "_Options..."
 msgstr "_Alternativer"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "efter"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "fЬr"
 
@@ -2386,7 +3514,7 @@ msgstr "slut pЕ aftale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minut(ter)"
 
@@ -2403,206 +3531,231 @@ msgid "10 minutes"
 msgstr "10 minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 timer (AM/PM)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 timer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minutter"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "Indstillinger for _post..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Pip nЕr alarmvinduet kommer til syne."
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "OppgavelisteoppfЬring som gЕr ut idag:"
 
 #: 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"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Opret en ny aftale"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "OpsФtning af kalender"
+#, fuzzy
+msgid "Days"
+msgstr "Dag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Ugens fЬrste dag:"
 
 #: 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/recurrence-page.c:969
+msgid "Friday"
+msgstr "fredag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
-msgid "Colors for Tasks"
-msgstr "(Ingen mappe vist)"
+msgid "Hours"
+msgstr "timer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
-msgid "Compress weekends in month view"
-msgstr "Sammenpres weekender"
+msgid "Minutes"
+msgstr "minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "Alternativer for datonavigator"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "mandag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Forvalg"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Overskredne opgaver"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "Vis"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "lЬrdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Dagen slutter:"
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "Vis sluttider for aftaler"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "Ugens fЬrste dag:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Vis ugenumre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "fre"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "Dagens starter:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "fredag"
+#, fuzzy
+msgid "Su_n"
+msgstr "sЬn"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "sЬndag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "man"
+#, fuzzy
+msgid "T_hu"
+msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "mandag"
+#, fuzzy
+msgid "T_ue"
+msgstr "tir"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Punkter som skal afsluttes idag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "Overskredne opgaver"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "torsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "PЕmind mig om alle aftaler"
+#, fuzzy
+msgid "Time"
+msgstr "Titel"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"Tidszone: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "lЬr"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Tidsopdeling:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "lЬrdag"
+msgid "Time format:"
+msgstr "Tidsformat:"
 
 #: 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/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "tirsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Vis ugenumre"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "Dagens starter:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "Arbejds_uge"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "sЬn"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 timer (AM/PM)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "sЬndag"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 timer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "Opgaver"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "Punkter som skal afsluttes idag"
+msgid "_Compress weekends in month view"
+msgstr "Sammenpres weekender"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "tor"
+#, fuzzy
+msgid "_Display"
+msgstr "Vis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "torsdag"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Dagen slutter:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "Titel"
+msgid "_Fri"
+msgstr "fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Tidsopdeling:"
+#, fuzzy
+msgid "_General"
+msgstr "Generel"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Tidsformat:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Skjul slettede beskeder"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"Tidszone: "
+msgid "_Mon"
+msgstr "man"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "tir"
+#, fuzzy
+msgid "_Other"
+msgstr "Andet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "tirsdag"
+#, fuzzy
+msgid "_Sat"
+msgstr "lЬr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "ons"
+#, fuzzy
+msgid "_Task List"
+msgstr "Opgaver"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "onsdag"
+#, fuzzy
+msgid "_Wed"
+msgstr "ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
-msgid "Work Week"
-msgstr "Arbejds_uge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "minutter fЬr de skal ske."
+msgid "before the start of the appointment"
+msgstr " fЬr begyndelse pЕ aftale"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2667,65 +3820,60 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "FФrdig-dato"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "RedigИr aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalpunkt - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2733,12 +3881,12 @@ 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2784,44 +3932,35 @@ msgstr "Er du sikker pЕ at du vil slette opgaven '%s'?"
 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/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "VФlg fil"
+msgid "Addressbook..."
+msgstr "Adressebog"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "Sektioner:"
+msgid "Delegate To:"
+msgstr "Slettet"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 #, fuzzy
-msgid "Time Zones"
-msgstr ""
-"\n"
-"Tidszone: "
-
-#: 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 ""
+msgid "Enter Delegate"
+msgstr "Slettet"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "PЕmindelse"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Gentagelse"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "AnnullИr mЬde"
@@ -2830,173 +3969,189 @@ msgstr "AnnullИr mЬde"
 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/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Optaget"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klassificering"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "_Fortrolig"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Dato & tidspunkt"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "uge"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Of_fentlig"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Vis"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_Fortrolig"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "S_lut-tid:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "Gruppenavn:"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "Kilder"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "NЬdvendig deltager"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Mulig deltager"
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Slettet"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "Under udarbejdelse"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "NЬdvendig deltager"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Mulig deltager"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Ikke-deltager"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Sendt"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Slet..."
@@ -3039,19 +4194,18 @@ msgid "Role"
 msgstr "Rolle"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: 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 "ArrangЬr:"
@@ -3096,13 +4250,14 @@ msgstr "den"
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 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:1
+#, fuzzy
+msgid "A_dd"
+msgstr "TilfЬj"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3113,26 +4268,33 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Regel for genindtrФffelse"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Simpel genindtrФffelse"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Egendefineret genindtrФffelse"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "фndr"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Ingen genindtrФffelse"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Simpel genindtrФffelse"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "for"
@@ -3174,165 +4336,161 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% fФrdi_g:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "Slettet"
+msgid "Date Completed:"
+msgstr "FuldfЬrt dato:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "Ingen"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "Fremskridt"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Opgave"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% fФrdi_g:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "Fremskridt"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Tildelt"
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Beskrivelse:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Sta_rt dato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Fortrolig"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 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
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klip _ud"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_KopiИr"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_IndsФt"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "MarkИr som fuldfЬrt"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Slet denne opgave"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "MarkИr som fuldfЬrt"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Slet opgaven"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, fuzzy, no-c-format
-msgid "% Complete"
-msgstr "% fФrdi_g:"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
+msgstr "* Klik her for at tilfЬje en kontakt *"
 
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
@@ -3367,23 +4525,23 @@ msgstr "Geografisk position"
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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"
@@ -3395,155 +4553,263 @@ msgstr "%02i minutters opdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Ny aftal_e"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "GЕ _til idag"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "GЕ til dato..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Fjern denne aftale"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Gem aktiv fil"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Slet alle opfЬringer"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Slet alle opfЬringer"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "_Dette er postadressen"
+msgid "Meeting Information"
+msgstr "Information"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "AnnullИr mЬde"
+
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "S_lut-tid for mЬde:"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "_Dette er postadressen"
+
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Den fil eksisterer men kan ikke lФses."
+msgid "Meeting Reply"
+msgstr "AnnullИr mЬde"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "VФlg fil"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Find i besked"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Information"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "Opgaveblok"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "var efter"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "_OpgaveforespЬrgsel"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Svar"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:691
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "AnnullИr mЬde"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Kalenderbesked"
+
+#: calendar/gui/e-itip-control.c:713
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:714
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "Mappen set ud til at vФre uigenkaldeligt Ьdelagt."
+msgid "Free/Busy Information"
+msgstr "Ingen information"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "Ledig-optaget URL"
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "Ledig-optaget URL"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Forrige besked"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "FuldfЬrt dato:"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikke lФse din kalenderfil!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% fФrdi_g:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Dato sendt"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3581,44 +4847,27 @@ msgstr "dagen begynder"
 msgid "date-start"
 msgstr "dagen slutter"
 
-#: 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:252
-msgid "Category:"
-msgstr "Kategori:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indlФse opgaverne i '%s'"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, 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"
 
-#. 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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Ny aftale..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke Еbne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, 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"
@@ -3644,43 +4893,43 @@ msgid "Go To Date"
 msgstr "GЕ til dato"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "juli"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "juni"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "marts"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "maj"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "november"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "oktober"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "GЕ til i dag"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3836,12 +5085,6 @@ msgstr "fre"
 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:1815
 #, fuzzy
@@ -3878,9 +5121,8 @@ msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "ForhЕndsvisning af udskrift"
 
@@ -3893,7 +5135,7 @@ msgstr "Udskriv denne ting"
 msgid "Print Setup"
 msgstr "SkriveropsФtning"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "URI for opgavemappen der skal vises"
 
@@ -3937,6 +5179,102 @@ 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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"
@@ -4000,6 +5338,7 @@ msgid "Unable to process spool folder"
 msgstr ""
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
@@ -4036,7 +5375,7 @@ msgstr ""
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -4059,12 +5398,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ugyldig type i krop-beholder, forventer streng"
 
@@ -4178,13 +5517,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Ingen adgangskode oplyst."
 
 #: 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke oprette rЬr til GPG/PGP: %s"
@@ -4202,16 +5541,16 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr "Kunne ikke oprette midlertidig fil: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 #, fuzzy
 msgid "No plaintext to encrypt."
 msgstr "Klik pЕ ikonen for at dekryptere."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Ingen modtagere specificeret"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4245,7 +5584,7 @@ msgid "Connection cancelled"
 msgstr "Forbindelse annulleret"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
@@ -4256,7 +5595,7 @@ msgstr "(ukendt vФrt)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Handling annulleret"
 
@@ -4376,42 +5715,70 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Autenticering krФves"
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Adgangskode"
+
+#: camel/camel-sasl-popb4smtp.c:34
+#, fuzzy
+msgid "POP before SMTP"
+msgstr "Sikker SMTP"
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Kilder"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' skal indeholde et brugernavn"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' skal indeholde et vertsnavn"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' skal indeholde en sti"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "LЬser: '%s'"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4424,12 +5791,12 @@ msgstr "E-post-udbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lФsning af e-post som en anmodning pЕ et andet sФt af mapper"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen udbyder tilgФngelig for protokol `%s'"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4476,7 +5843,7 @@ msgstr "VedhФft bilag til meddelelsen"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4484,7 +5851,7 @@ msgid ""
 msgstr "Emne er %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4528,61 +5895,61 @@ msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitse-kataloget."
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "Serversvar afsluttet for tidligt."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, 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:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, 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:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indlФse sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Gemmer beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Gemmer beskeder"
@@ -4596,7 +5963,7 @@ msgstr "Kunne ikke finde beskedskrop i FETCH-svar."
 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
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Tjekker for nyt post"
 
@@ -4604,7 +5971,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Mapper"
 
@@ -4635,8 +6002,8 @@ msgstr "For lФsning og gemning af 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 valg vil lade dig koble til en IMAP-tjener ved at bruge en "
-"klartekst-adgangskode."
+"Dette valg vil lade dig koble til en IMAP-tjener ved at bruge en klartekst-"
+"adgangskode."
 
 #: camel/providers/imap/camel-imap-store.c:463
 #, c-format
@@ -4644,7 +6011,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen stЬtte for autenticeringstype %s"
@@ -4655,7 +6022,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
@@ -4670,12 +6037,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4767,7 +6134,7 @@ msgstr "Kan ikke tilfЬje besked i maildir-mappe: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4781,7 +6148,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4854,20 +6221,20 @@ msgstr "Kan ikke Еbne postboks: %s: %s\n"
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: 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"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke tilfЬje besked i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4879,12 +6246,12 @@ msgstr ""
 "Kan ikke hente besked: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fremstilling af besked mislykkedes: Er postkassen Ьdelagt?"
@@ -4932,13 +6299,14 @@ msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 #. 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"
+#, fuzzy
+msgid "Summarizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr "Kunne ikke Еbne mappe: %s: summerer fra position %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4948,24 +6316,22 @@ 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"
+#, fuzzy, c-format
+msgid "Cannot summarize 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
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "Kunne ikke Еbne folder der skal laves oversigt for: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5071,6 +6437,17 @@ msgstr "Lokale mapper kan ikke vФre rekursive."
 msgid "Spool folders cannot be deleted"
 msgstr "Lokale mapper kan ikke vФre rekursive."
 
+#: 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-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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5163,39 +6540,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kunne ikke Еbne eller oprette .newsrc-fil for %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Modtager POP-oversigt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Kunne ikke koble til POP-tjener pЕ %s."
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Kunne ikke Еbne mappe: beskedslisten var ikke komplet."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "Ingen besked med uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Modtager POP-meddelelse %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Kunne ikke hente beskeden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kunne ikke hente besked fra POP-tjener %s: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "Ingen besked med uid %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Modtager POP-meddelelse %d"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr ""
@@ -5209,7 +6586,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:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5227,8 +6604,8 @@ msgid ""
 "is the only option supported by many POP servers."
 msgstr ""
 "Dette alternativ lader dig koble til POP-tjeneren ved brug af adgangskode i "
-"klartekst. Dette er det eneste alternativ som er understЬttet af mange "
-"POP-tjenere."
+"klartekst. Dette er det eneste alternativ som er understЬttet af mange POP-"
+"tjenere."
 
 #: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
@@ -5304,7 +6681,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:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5358,7 +6735,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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5366,122 +6743,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:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfejl, kommando ikke genkendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Kommando ikke implimenteret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "HjФlpebesked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Tjeneste parat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Transaktionen mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "AdganggskodeoverfЬring krФves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "Autenticeringsmekanismen er for svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering krФves for forespurgt autenticeringsmekanisme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autenticeringsfejl"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Autenticering krФves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, 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:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5492,127 +6869,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-levering af e-post via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende besked: afsenderadresse ikke defineret."
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Sender meddelelse"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO fejl ved svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Godkendelse"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-forespЬrgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Tidsafbrud for AUTH-forespЬrgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldigt svar pЕ autenticering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, 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:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-anmodning overskred tid: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET fejl ved svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, 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:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT fejl ved svar: %s: ikke-fatal"
@@ -5642,7 +7019,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "bilag"
 
@@ -5675,52 +7052,52 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Klik her for adressebogen"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerne for meddelelsen"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Kopi:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 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:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "B-kopi:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5751,46 +7128,46 @@ msgstr ""
 "Fejl ved udfЬring af operation:\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Advarsel"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl ved gemning af fil: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl ved indlФsning af fil: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved gemning af fil: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra POP-tjener %s: %s"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5799,7 +7176,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil:  %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5808,7 +7185,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil:  %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5817,13 +7194,13 @@ msgstr ""
 "Fejl ved gemning af beskeder til: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5833,25 +7210,25 @@ msgstr ""
 "\n"
 "Vil du gemme Фndringene?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "еbn fil"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "IndsФt tekstfil..."
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Skriv en meddelelse"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Kan ikke oprette komponeringsvinduet."
 
@@ -5877,57 +7254,103 @@ msgstr "Adressekort"
 msgid "calendar information"
 msgstr "Kalenderinformation"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "indeholder"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "indeholder ikke"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "Kommentar indeholder"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Navn indeholder"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Modtagere"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Navn indeholder"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Navn indeholder"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "indeholder 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %Y-%m-%d"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5935,13 +7358,13 @@ msgstr "%a %Y-%m-%d"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:303
+#: e-util/e-time-utils.c:313
 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
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
@@ -6039,7 +7462,7 @@ msgstr "et tidspunkt relativt til den aktuelle tid"
 msgid "Compare against"
 msgstr "Sammenlign med"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "nu"
 
@@ -6052,11 +7475,15 @@ msgstr "siden"
 msgid "ago"
 msgstr "siden"
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%a %Y-%m-%d %H:%M:%S"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<klik her for at vФlge en mappe>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Filterregler"
 
@@ -6077,20 +7504,20 @@ 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:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "VФlg mappe"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Indtast URI for mappen"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<klik her for at vФlge en mappe>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6111,62 +7538,51 @@ msgstr "Regelnavn: "
 msgid "Untitled"
 msgstr "Uden navn"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "UdfЬr handlinger"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er mЬdt"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er mЬdt"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "TilfЬj kriterie"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "indkommende"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "RedigИr filtre"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "RedigИr vMapper"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Indkommende"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "UdgЕende"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Visuelle mapper"
 
@@ -6190,194 +7606,195 @@ msgstr "med alle lokale og aktive fjernmapper"
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Giv farve"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Giv point"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Bilag"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "indeholder"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "KopiИr til mappe"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "indeholder ikke"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "lyder ikke som"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Findes ikke"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Udkast"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Findes"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "findes"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Udtryk"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Vigtig"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "er stЬrre end"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "er mindre end"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Diskussionsliste"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "Beskedshoved"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "Beskeden blev modtaget"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "Beskeden blev sendt"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Flyt til folder"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "pЕ eller efter"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "pЕ eller fЬr"
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "LФst"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Passer pЕ regulФrt udtryk"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Afsender"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "_SФt Status"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "StЬrrelse"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Specifik brevhoved"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "starter med"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "indeholder"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "indeholder ikke"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "slutter ikke med"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "lyder ikke som"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "starter ikke med"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "slutter med"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "findes"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "er stЬrre end"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "er mindre end"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "er ikke"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "pЕ eller efter"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "pЕ eller fЬr"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "lyder som"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "starter med"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "var efter"
@@ -6407,14 +7824,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "ImportИr"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Epost"
 
@@ -6439,11 +7855,11 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6496,169 +7912,190 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr "Konfiguration af epost"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "vMappe efter diskussionsliste"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "Egenska_ber..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "фndr filens egenskaber"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "_Postmeddelelse"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "_Postmeddelelse"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere gemning i skallen"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaber for \"%s\""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "_Opret filter fra besked"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "VFolder pЕ e_mne"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "vMappe for _afsender"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "vMappe for _modtagere"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "Vfolder efter diskussions_liste"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "FiltrИr efter emne"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "FiltrИr efter afsender"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "FiltrИr efter modtager"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "FiltrИr efter diskussionsliste"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "Gensend"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "_Gem besked som..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_Gem som..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_Udskriv"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Svar til afsende_r"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "MФr_k som lФst"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "MФrk som u_lФst"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Vigtig"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "MarkИr som ulФst"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_Flyt til mappe..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_KopiИr til mappe..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Fortryd sletning"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "TilfЬj adressebog"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Anvend filtre"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "Skab rege_l fra besked"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "FiltrИr efter epostliste"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "vMappe efter diskussionsliste"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "FiltrИr efter diskussionsliste (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMappe efter diskussionsliste (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Kalenderinformation"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6720,16 +8157,16 @@ msgid "Evolution News Editor"
 msgstr "Evolution kontoredigering"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolution kontoredigering"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Signaturfil:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6740,40 +8177,45 @@ msgstr ""
 "\n"
 "Vil du gemme Фndringene?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (standard)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "DeaktivИr"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "AktivИr"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 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:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Fortryd sletning"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "GЬr dette til min standardkonto"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker pЕ at du vil slette denne nyhedskonto?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Evolution kontobehandler"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "Indstillinger for _post..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6827,11 +8269,11 @@ msgstr ""
 "Du skal konfigurere en epost-transport\n"
 "fЬr du kan sende epost."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke sat en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6839,7 +8281,7 @@ msgstr ""
 "Denne meddelse har intet emne.\n"
 "Skal den sendes alligevel?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6847,37 +8289,36 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 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:410
+#: mail/mail-callbacks.c:390
 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:653
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "Den %s skrev %s:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Videresendt meddelelse:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Flyt meddelelse(r) til"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "KopiИr meddelelse(r) til"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, 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:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6885,7 +8326,7 @@ msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitse-kataloget."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6893,25 +8334,41 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, 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:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Beskeden blev modtaget"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Advarsel"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+msgid "Do not ask me again."
+msgstr ""
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6920,137 +8377,153 @@ msgstr ""
 "Fejl ved indlФsning af filter information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Udskrivning af besked mislykkedes"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, 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-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
-"Venligst indtast dit navn og din e-post adresse nedenunder. "
-"&quot;optional&quot; felterne nedenunder behЬver ikke at blive udfyldt, "
-"medmindre du Ьnsker at have denne information med i breve du sender."
+"Venligst indtast dit navn og din e-post adresse nedenunder. &quot;"
+"optional&quot; felterne nedenunder behЬver ikke at blive udfyldt, medmindre "
+"du Ьnsker at have denne information med i breve du sender."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Venligst indtast information om din tjener for indkommende e-post "
 "nedenunder. Hvis du ikke vИd hvilken slags server du skal bruge, sЕ kontakt "
 "din systemadministrator eller internetudbyder."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Venligst indtast information om protokol for udgЕende e-post nedenunder. "
 "Hvis du ikke vИd hvilken protokol du skal bruge, sЕ kontakt din "
 "systemadministrator eller internetudbyder."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Evolution konto-guide"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 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"
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " farve"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, 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
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "kontoinformation"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Kontoadministration"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Konti"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 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:9
+msgid "Always sign outgoing messages when using this account"
+msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilag"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Godkendelsestype: "
 
-#: 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:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Beskedskriver"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7062,295 +8535,375 @@ msgstr ""
 "Din epost-konfiguration er nu komplet.\n"
 "Klik \"FuldfЬr\" for at gemme dine nye indstillinger"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Vis"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "FФrdig"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Kladder"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Kladdemappe:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "RedigИr..."
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "E_nable"
+msgstr "AktivИr"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "Epostadresse:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Gem aktiv fil med et andet navn"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "RedigИr..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "AktivИr"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Fulde navn:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr ""
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Vis i brev"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Konfiguration af epost"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, 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:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "Udskriv den valgte meddelelse"
+msgid "Make this my _default account"
+msgstr "GЬr dette til min standardkonto"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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:60
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Nyheder"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr "PGP binФrsti:"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "VФlg en farve"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Prompt when sending messages with an empty subject"
+msgid "Prompt when sending messages with an _empty subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "BemФrkning"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Modtager post"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Modtager post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Secure MIME"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_Sikkerhed"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "VФlg fil"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "VФlg PGP binФr"
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
-msgstr ""
-
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Sender post"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Sender post"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Konfiguration af tjener"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Tjenertype:"
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "Server krФver autentificering"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Ingen information"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Specielle mapper"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix mbox"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use secure connection (_SSL)"
 msgstr "Brug sikker forbindelse (SSL)"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Brugernavn:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "_Always load images off the net"
+msgstr "IndlФs aftid billeder fra nettet"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "Tjek automatisk for nye beskeder hvert"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr " Tjek for stЬttede typer"
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "Epostadresse:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Fulde navn:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config.glade.h:100
+msgid "_Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "VФrt:"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "Udskriv den valgte meddelelse"
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "Navn:"
+
+#: mail/mail-config.glade.h:106
+#, fuzzy
+msgid "_Never load images off the net"
+msgstr "IndlФs aftid billeder fra nettet"
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Organisation:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "PGP binФrsti:"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Sti:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Husk denne adgangskode"
+
 #: mail/mail-config.glade.h:112
 #, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Send brevet i HMTL-format"
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Brugernavn:"
+
+#: mail/mail-config.glade.h:116
+#, fuzzy
 msgid "newswindow1"
 msgstr "nu"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "sekunder."
 
@@ -7408,184 +8961,195 @@ msgstr ""
 "Kunne ikke oprette mappe `%s':\n"
 "%s"
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Gem bilag"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Gem pЕ disk..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Vis i brev"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "еbn i %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis i brev (via %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "IndlФser indholdet af beskeden"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_еpne i nytt vindu"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "KopiИr placering (RETMIG)"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gem som (RETMIG)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gem som..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Skjul valgte beskeder"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d sekunder"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "Epostadresse:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Afsender"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "Svar-til:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Modtager"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Kopi:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "Krypteret besked ikke vist"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Krypteret besked"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Klik pЕ ikonen for at dekryptere."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 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:1388
+#: mail/mail-format.c:1403
 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:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-tjener (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, 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:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til FTP-tjener (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt eksternt data (\"%s\"-type)"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Mappen %s eksisterer ikke"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "еbner '%s'"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "фndrer mappe \"%s\" til \"%s\" format"
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7594,7 +9158,7 @@ msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne Еbne denne mappe igen: %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7602,14 +9166,14 @@ msgstr ""
 "Hvis du ikke kan Еbne denne postboks igen skal\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, 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
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "KonfigurИr %s"
@@ -7632,105 +9196,130 @@ msgstr ""
 "Fejl ved udfЬring af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Husk denne adgangskode"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Arbejder"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "FiltrИr efter afsender"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Modtager post"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender '%s'"
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "FuldfЬrt."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "Gemmer besked i mappe"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter meddelelser til %s"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "KopiИrer"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i '%s'"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "еbner mappe %s"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "еbner lager %s"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Opretter en ny mappe"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "еbner mappe %s"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "SynkronisИr \"%s\""
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_RekonfigurИr mappe"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "TЬmmer mappe for slettede beskeder"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Modtager meddelelse %s"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Modtager meddelelser"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gemmer beskeder"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7739,7 +9328,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil:  %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7748,11 +9337,11 @@ msgstr ""
 "Fejl ved gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7761,80 +9350,76 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Epost fra %s"
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_SЬg"
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(Unavngivet besked)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(Unavngivet besked)"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "Kopierer beskeder"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "Find i besked"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "SЬg efter en streng"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Find:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Matcher:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "Afbryder..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Send & modtag e-post"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Modtager"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "Sender"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Afbrudt"
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Handling annulleret"
@@ -7854,82 +9439,88 @@ msgstr "Videresendt meddelelse - %s"
 msgid "Forwarded message"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Fwd: (uden emne)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "Besked"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "UlФst"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "LФst"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "Flere ulФste beskeder"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "HЬjere"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "HЬjest"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Idag %h:%M"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "IgЕr %h:%M"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%a %Y-%m-%d %H:%M:%S"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "TrЕdet meddelelsesliste"
 
 #: mail/message-list.etspec.h:2
@@ -7944,38 +9535,79 @@ msgstr "Modtaget"
 msgid "Size"
 msgstr "StЬrrelse"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Mappe"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "Gem"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Vis mapper som som starter med:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Skanner mapper i '%s'"
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Henter lager for \"%s\""
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Skanner mapper i '%s'"
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer pЕ mappe \"%s\""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement pЕ mappe \"%s\""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Mappe"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "Beskeden blev modtaget"
+
+#: mail/subscribe-dialog.c:1547
+#, fuzzy
+msgid "Please select a server."
+msgstr "VФlg tjeneste"
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "OpdatИr liste"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Mapper"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Vis valgmuligheder"
+
+#: mail/subscribe-dialog.glade.h:4
+#, fuzzy
+msgid "Folders whose names begin with:"
+msgstr "Vis mapper som som starter med:"
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "_HЕndtИr abonnementer"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "AbonnИr"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Opsig abonnement"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -7984,55 +9616,72 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr ""
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Aftaler"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Vis aftaler"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%H:%M"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%a %H:%M"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Sammendrag"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 #, fuzzy
 msgid "Add a news feed"
 msgstr "TilfЬj tjeneste"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Navn:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Evolution installation"
+msgid "Summary Settings"
+msgstr "Sammendrag indeholder"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8043,7 +9692,12 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fejl ved indlФsning af kalender</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "%s-tjener %s"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Vis opgaver"
@@ -8052,28 +9706,33 @@ msgstr "Vis opgaver"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Andet"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Sektioner:"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %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"
+msgid "Print Summary"
+msgstr "Sammendrag"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "Udskrivning af besked mislykkedes"
 
 #: my-evolution/main.c:52
@@ -8081,6 +9740,42 @@ msgstr "Udskrivning af besked mislykkedes"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Skrifttyper"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Flytter"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Filtre"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "Filtre"
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9279,131 +10974,146 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "TilfЬj tjeneste"
+msgid " _Remove"
+msgstr "Fjern"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Mapper"
+msgid "Add n_ew feed"
+msgstr "TilfЬj tjeneste"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Alle deltagere"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "Alle deltagere"
+msgid "All _folders:"
+msgstr "Mapper"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Vis mapper som som starter med:"
+msgid "All news _feeds:"
+msgstr "TilfЬj tjeneste"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Vis valgmuligheder"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "Vis"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
 #, fuzzy
-msgid "Five days"
-msgstr "fredag"
+msgid "News Feed Settings"
+msgstr "Indstillinger"
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "mЕned"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr " 1 uge"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
 #, fuzzy
-msgid "News Feed Settings"
-msgstr "Indstillinger"
+msgid "Show _all tasks"
+msgstr "Vis opgaver"
 
 #: my-evolution/my-evolution.glade.h:14
 #, fuzzy
-msgid "News Feeds"
-msgstr "%s-tjener %s"
+msgid "Show _today's tasks"
+msgstr "Vis opgaver"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "onsdag"
+msgid "Tasks "
+msgstr "Opgaver"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "mЕned"
+msgid "Units: "
+msgstr ""
+"\n"
+"Enhed:  "
 
 #: 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 ""
+msgid "Weather settings"
+msgstr "Sjekk innstillinger"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr ""
-"AfsФt\n"
-"tid"
+msgid "_Display folders:"
+msgstr "Vis mapper som som starter med:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Vis opgaver"
+msgid "_Display stations:"
+msgstr "Vis valgmuligheder"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "Vis fulde brev_hoveder"
+msgid "_Displayed feeds:"
+msgstr "Vis"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Vis opgaver"
+msgid "_Five days"
+msgstr "fredag"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "Opgaver"
+msgid "_Mail"
+msgstr "_Mobil"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"Enhed:  "
+msgid "_News Feeds"
+msgstr "%s-tjener %s"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Andet"
+msgid "_One day"
+msgstr "onsdag"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "Sjekk innstillinger"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "april"
+msgid "_Schedule"
+msgstr ""
+"AfsФt\n"
+"tid"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "Vis fulde brev_hoveder"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Andet"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "april"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9420,7 +11130,17 @@ msgstr "Detaljer"
 msgid "Cancel Operation"
 msgstr "AnnullИr mЬde"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Specielle mapper"
@@ -9473,7 +11193,7 @@ msgid ""
 "`%s'."
 msgstr "En fejl skete ved lФsning af filen."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9484,7 +11204,7 @@ msgstr ""
 "Venligst fjern denne for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9493,7 +11213,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9504,57 +11224,80 @@ msgstr ""
 "Venligst fjern denne for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Kan ikke fЕ fat pЕ mappe: %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "Kan ikke kopiere filer til\n"
 "'%s'."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "KopiИr til mappe"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Flyt til folder"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Kunne ikke slette mappen `%s'\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "VФlg mappe"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, 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
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "еbner mappe %s"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Regelnavn: "
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Mappenavn:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9568,7 +11311,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "Det angivne katalognavn er ikke gyldigt."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - opret ny mappe"
 
@@ -9580,11 +11323,11 @@ msgstr ""
 "Typen pЕ den valgte mappe er ikke gyldig til\n"
 "den Ьnskede operation."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Unavngivet)"
 
@@ -9624,7 +11367,7 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opfЬring %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9673,7 +11416,7 @@ msgstr "Automatisk"
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "VФlg fil"
 
@@ -9681,31 +11424,53 @@ msgstr "VФlg fil"
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "VФlg mappe"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr "Afbryder forbindelser..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Kan ikke initialisere Evolutions e-postkomponent."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Fejl-Frede fandtes ikke i din $PATH"
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Fejl-Frede kunne ikke kЬres"
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Ophavsret tilhЬrende Ximian, Inc. 1999-2001."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9715,88 +11480,105 @@ msgstr ""
 "til administrering af post, kalender og aftaler\n"
 "indenfor Gnomes skrivebordsmiljЬ."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "GЕ til mappe..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Opret en ny genvejsgruppe"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "Arbejd pЕ nettet"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#. 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke opsФtte lokal gemning -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views 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
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "O.k."
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "Ugyldigt indhold af meddelelse"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "Kan ikke registrere gemning i skallen"
+
+#: shell/e-shell.c:1648
+#, fuzzy
+msgid "Configuration Database not found"
+msgstr "Konfiguration af epost"
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Almindelig fejl"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Opret en ny kontakt"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9805,183 +11587,169 @@ msgstr ""
 "ьnsker du virkelig at fjerne gruppe %s\n"
 "fra genvejsbjФlken?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Fjern ikke"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "_SmЕ ikoner"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Vis genveje som smЕ ikoner"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Vis genveje som store ikoner"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Opret en ny genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Fjern denne gruppe..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Fjern denne gruppe..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "Skjul genvejsbjФlken"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Skjul genvejsbjФlken"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New Window"
 msgstr "_еpne i nytt vindu"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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:479
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejsbjФlken"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Fejl under gemning af genveje."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, 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
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Uden navn)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Ingen fejl"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Almindelig fejl"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Specificeret mappetype er ikke gyldig"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "I/U-fejl"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plads til at oprette mappen"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Angivet mappe blev ikke fundet"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Funktionen ikke implementeret i denne gemning"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Operationen er ikke understЬttet"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 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
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Angivet mappe blev ikke fundet"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% fФrdi_g:"
 
@@ -10003,10 +11771,6 @@ msgstr "VФrt:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Mappenavn:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Mappetype:"
@@ -10020,17 +11784,29 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klik \"ImportИr\" for at starte importering af filen til Evolution."
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Evolution importeringsprogram"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Evolution importЬrprogram"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "VФlg fil"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "Velkommen til Evolutions importvФrktЬj.\n"
@@ -10051,10 +11827,11 @@ msgid "Don't ask me again"
 msgstr ""
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
-msgstr ""
+#, fuzzy
+msgid "Evolution can import data from the following files:"
+msgstr "Evolution komponent til hЕndtering af post."
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10079,10 +11856,10 @@ msgstr ""
 "endnu.\n"
 "\n"
 "Vi hЕber at Evolution vil vФre nyttig for dig, men vi fЬler fremdeles\n"
-"behov for at advare dig om fЬlgende: Evolution vil: gЕ ned, miste din "
-"e-post\n"
-"nЕr du ikke vil have at det skal ske, efterlade sig vilfarne processer som  "
-"\n"
+"behov for at advare dig om fЬlgende: Evolution vil: gЕ ned, miste din e-"
+"post\n"
+"nЕr du ikke vil have at det skal ske, efterlade sig vilfarne processer "
+"som  \n"
 "spiser 100% af din CPU-tid, lЕse sig, sende e-post i HTML-format til\n"
 "tilfФldige e-postlister, og gЬre dig pinlig for dine venner og kolleger.\n"
 "Brug kun efter anbefaling.\n"
@@ -10090,7 +11867,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:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10098,25 +11875,30 @@ msgstr ""
 "Tak\n"
 "Holdet bag Evolution\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Kan ikke initialisere Evolution-skallen."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Kan ikke initialisere Evolution-skallen."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "DeaktivИr opstartsskФrm"
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere komponentsystemet, Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "KopiИr"
 
@@ -10133,11 +11915,11 @@ msgstr "Opret ny kontakt"
 msgid "Create new contact list"
 msgstr "Opret ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Klip ud"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Klip valget ud"
 
@@ -10146,78 +11928,122 @@ msgstr "Klip valget ud"
 msgid "Delete selected contacts"
 msgstr "Slet kontakt"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Ny kontakt"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Nyheder"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "IndsФt"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "IndsФt fra klippebordet"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Viser forhЕndsvisning af beskeden som skal udskrives"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Udskriv kontakt"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "Slet kontakt"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "VФlg alle"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Slet kontakt"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Ny _meddelelse til kontaktperson"
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "Slet kontakt"
+
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Ny _meddelelse til kontaktperson"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "Send _kontaktperson til andre..."
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Stop indlФsning"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "Ha_ndlinger"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "_Adressebog-kilder..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Kontakter..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Udskriv..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Gem som vCard"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_SЬg efter kontakter"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_VФrktЬj"
 
@@ -10228,111 +12054,132 @@ msgstr "Klik her for adressebogen"
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "Opret en ny aftale for hele dagen"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Opret en ny aftale"
+msgid "Create a New _Task"
+msgstr "Opret en ny opgave"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Opret en ny aftale"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "Dag"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Slet denne aftale"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "GЕ til"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "GЕ tilbage i tiden"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "GЕ fremad i tid"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "GЕ til _dato"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "GЕ til specifik dato"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "GЕ til nutiden"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "GЕ til i dag"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "_MЕned"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Ny aftale"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Ny opgave"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Udskriv kalender"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Vis udskrift"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Print this calendar"
 msgstr "Udskriv denne kalender"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Vis Иn dag"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Vis Иn mЕned"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Vis Иn uge"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Vis arbejdsugen"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "Arbejds_uge"
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "Week"
+msgstr "_Uge"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "_Aftale"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "Indstillinger for _post..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "_Dag"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "_MЕned"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Ingen information"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "_Uge"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_Opgave"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10343,15 +12190,16 @@ msgid "Close"
 msgstr "Luk"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Luk denne aftale"
+#, fuzzy
+msgid "Close this item"
+msgstr "Slet dette punkt"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Slet denne aftale"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Slet dette punkt"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Den centrale vФrktЬjslinje"
 
@@ -10360,117 +12208,85 @@ msgstr "Den centrale vФrktЬjslinje"
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Udskriv..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Gem"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Gem opgaven og luk dialogboksen"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "HjФlp"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Skriv kuvert..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "_Gem som..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Gem kontakten og luk dialogboksen"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Send _kontaktperson til andre..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Se hjФlpetekster"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Ny _meddelelse til kontaktperson"
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Gem"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Slet dette punkt"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Slet..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Gem opgaven og luk dialogboksen"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "Send _kontaktperson til andre..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "Ny _meddelelse til kontaktperson"
@@ -10480,21 +12296,21 @@ msgstr "Ny _meddelelse til kontaktperson"
 msgid "Cancel Mee_ting"
 msgstr "AnnullИr mЬde"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Videresend som v_Kalender (RET)"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Videresend denne meddelelse"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10509,16 +12325,11 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr "_PlanlФg mЬde"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "PlanlФg mЬde"
 
-#: 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-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10534,69 +12345,66 @@ msgid "Cancel the current mail operation"
 msgstr "Gem aktiv fil"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Skriv"
-
-#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "Udskriv ny meddelelse"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "_TЬm papirkurven"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Glem _adgangskoder"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "_HЕndtИr abonnement..."
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "HjФlpebesked"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Send / modtag"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Afsend kЬet post og modtag ny post"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Show message preview window"
 msgstr "Ny _meddelelse til kontaktperson"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering af virtuelle mapper..."
 
@@ -10621,97 +12429,108 @@ msgstr "Smugkig"
 msgid "_Send / Receive"
 msgstr "_Send / modtag"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "Abonnerer pЕ mappe \"%s\""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Skjul valgte beskeder"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Klip ud"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Skjul valgte beskeder"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Skjul slettede beskeder"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Skjul _lФste beskeder"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "MФrk alle som l_Фst"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "IndsФt fra klippebordet"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "VФlg _alle"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "VФlg _trЕd"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
 msgstr "Vis _alt"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "TrЕdet meddelelsesliste"
 
@@ -10719,7 +12538,7 @@ msgstr "TrЕdet meddelelsesliste"
 msgid "_Expunge"
 msgstr "_TЬm"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Mappe"
 
@@ -10727,11 +12546,11 @@ msgstr "_Mappe"
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "Egenska_ber..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "TrЕdet meddelelsesliste"
@@ -10987,7 +12806,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "Udskriv den valgte meddelelse"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Viser forhЕndsvisning af beskeden som skal udskrives"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11009,43 +12829,37 @@ msgstr "Forrige besked"
 msgid "Previous Unread Message"
 msgstr "Forrige besked"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Udskriv besked..."
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "ForhЕndsvisning af udskrift"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Udskriv besked"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "_Postmeddelelse"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "RedigИr sideindstillinger for aktiv skriver"
+
 #: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
@@ -11091,74 +12905,57 @@ msgstr "vMappe for _modtagere..."
 msgid "VFolder on _Subject..."
 msgstr "vMappe pЕ e_mne..."
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Anvend filtre"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "KopiИr til mappe"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "_Opret filter fra besked"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Videresendte meddelelser"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Beskeder"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Flyt til folder"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Vis"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "Send beskeder _igen"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "Send beskeder _igen"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Luk dette vindue"
 
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "L_uk"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vis"
 
@@ -11225,11 +13022,6 @@ msgstr "PGP-kryptИr"
 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"
@@ -11359,7 +13151,7 @@ msgstr "_Svar-til-felt"
 msgid "_Security"
 msgstr "_Sikkerhed"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_HjФlp"
 
@@ -11393,15 +13185,29 @@ msgstr "Opsig abonnement"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "_Tildel opgave (RET)"
+
+#: ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Assign this task to others"
+msgstr "Tildel oppgaven til noen"
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "AnnullИr"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Slet opgaven"
+msgid "Cancel this task"
+msgstr "AnnullИr"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "OpdatИr liste"
@@ -11411,44 +13217,32 @@ msgstr "OpdatИr liste"
 msgid "Configure the task view's settings"
 msgstr "Klik her for adressebogen"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "_еbn valgte beskeder"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Opret en ny opgave"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Slet opgaven"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, 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:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "Indstillinger for _post..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_Opgave"
 
@@ -11486,185 +13280,166 @@ msgstr "Fjern denne genvej fra genvejsbjФlken"
 msgid "Create a new folder"
 msgstr "Opretter en ny mappe"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Slet dette punkt"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "_Afslut"
 
 # OSS = Ofte Stillede SpЬrgsmЕl
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr "Evolution OSS"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "Evolution _vindue"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Afslut program"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "Kom i gang"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "_еpne i nytt vindu"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Vis information om Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Toggle"
 msgstr "Rolle"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr ""
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr "Brug af kalenderen"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "Brug af postdelen"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Vis den valgte mappe"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Om Evolution"
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Aftale (RETMIG)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (RETMIG)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "_KopiИr"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_GЕ til mappe..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "_ImportИr fil..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "_Indeks"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "Send besked"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "_Gem som..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Ny Mappe"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "_еbn..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "_GenvejsbjФlke"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_GenvejsbjФlke"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "Opgave (RETMIG)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Arbejder"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "фndr visningen til %s"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
-msgstr "Indstillinger for _post..."
+msgid "Print summary"
+msgstr "Sammendrag"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "LФst"
+
+#: ui/my-evolution.xml.h:6
+#, fuzzy
+msgid "Reload the view"
+msgstr "HjФlpebesked"
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "Indstillinger for LedelsesresumИ..."
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
@@ -11700,6 +13475,30 @@ msgstr "Beskeder"
 msgid "With Category"
 msgstr "Med kategori"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "VФlg fil"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sektioner:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Tidszone: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11707,10 +13506,6 @@ msgstr "Med kategori"
 msgid "%A, %B %d, %Y"
 msgstr "%A den %e. %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Optaget"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "I marken"
@@ -11783,7 +13578,7 @@ msgstr "Alle deltagere"
 msgid "_Current View"
 msgstr "NuvФrende visning"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11793,19 +13588,20 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%a %d %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 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:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen skal skrives ind pЕ formatet: %s"
@@ -11893,35 +13689,33 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "Kontaktredigering"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Gem sЬgning"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "Avanceret sЬgning"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Gem sЬgning"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "T_Ьm"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Vis alt"
 
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Avanceret..."
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Information"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Advarsel"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Fejl"
@@ -11939,10 +13733,15 @@ msgstr "Besked"
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_SЬg"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "Afsend"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Den personlige adressebogsserver"
@@ -11963,6 +13762,304 @@ msgstr ""
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 
+#~ msgid "RDF Summary"
+#~ msgstr "RDF-sammendrag"
+
+#~ msgid "LDAP Server"
+#~ msgstr "LDAP server"
+
+#~ msgid "File"
+#~ msgstr "Fil"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Ukendt adressebogstype"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Ingen (anonym modus)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Ukendt auth type"
+
+#~ msgid "Subtree"
+#~ msgstr "UndertrФ"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Ukendt omrЕde-type"
+
+#~ msgid "Bind DN:"
+#~ msgstr "Bind DN:"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "RETMIG: Bind DN-hjФlpetekst ind her"
+
+#~ msgid "Root DN:"
+#~ msgstr "Rod-DN:"
+
+#~ msgid "Authentication:"
+#~ msgstr "Godkendelse:"
+
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "Avancerede LDAP-indstillinger"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "RETMIG: HjФlp for stier her?"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Opret sti hvis den ikke eksisterer."
+
+#~ 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."
+
+#~ msgid "Name"
+#~ msgstr "Navn"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Indtast adgangskode for %s"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "Navn indeholder"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "VФlg navn fra:"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Afbrudt"
+
+#~ msgid "Transparent"
+#~ msgstr "Gennemsigtig"
+
+#~ msgid "Opaque"
+#~ msgstr "Uigennemsigtig"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "Klassifikationen skal vФre en af 'Offentlig', 'Privat', \"Fortrolig' "
+#~ "eller 'Ingen'"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr ""
+#~ "Gennemsigtigheden skal vФre en af 'Gennemsigtig', 'Uigennemsigtig' eller "
+#~ "\"Ingen'."
+
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 timer (AM/PM)"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Pip nЕr alarmvinduet kommer til syne."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "OpsФtning af kalender"
+
+#, fuzzy
+#~ msgid "Colors for Tasks"
+#~ msgstr "(Ingen mappe vist)"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "Alternativer for datonavigator"
+
+#~ msgid "Defaults"
+#~ msgstr "Forvalg"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "PЕmind mig om alle aftaler"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minutter fЬr de skal ske."
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Slettet"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Ingen"
+
+#~ msgid "Task"
+#~ msgstr "Opgave"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% fФrdi_g:"
+
+#~ msgid "Transparency"
+#~ msgstr "Gennemsigtighed"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Den fil eksisterer men kan ikke lФses."
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Mappen set ud til at vФre uigenkaldeligt Ьdelagt."
+
+#~ msgid "All"
+#~ msgstr "Alle"
+
+#~ msgid "Edit"
+#~ msgstr "RedigИr"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Gem sЬgning som vMappe"
+
+#~ msgid "Resend"
+#~ msgstr "Gensend"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Evolution kontobehandler"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "Den %s skrev %s:"
+
+#~ msgid "Receiving"
+#~ msgstr "Modtager"
+
+#~ msgid "Store"
+#~ msgstr "Gem"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Vis mapper som som starter med:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "Henter lager for \"%s\""
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Evolution installation"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A den %e. %B %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Udskrivning af besked mislykkedes"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Ny kontakt"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "_Kontakt"
+
+#~ msgid "Go to present time"
+#~ msgstr "GЕ til nutiden"
+
+#~ msgid "Print this Calendar"
+#~ msgstr "Udskriv denne kalender"
+
+#~ msgid "W_ork Week"
+#~ msgstr "Arbejds_uge"
+
+#~ msgid "_Day"
+#~ msgstr "_Dag"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Luk denne aftale"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "SkriveropsФtning"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Gem aftalen og luk dialogboksen"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "Ha_ndlinger"
+
+#~ msgid "Help"
+#~ msgstr "HjФlp"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Send _kontaktperson til andre..."
+
+#~ msgid "See online help"
+#~ msgstr "Se hjФlpetekster"
+
+#~ msgid "Compose"
+#~ msgstr "Skriv"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "_HЕndtИr abonnement..."
+
+#~ msgid "Show _All"
+#~ msgstr "Vis _alt"
+
+#, fuzzy
+#~ msgid "Print Message..."
+#~ msgstr "Udskriv besked..."
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "ForhЕndsvisning af udskrift"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "Send beskeder _igen"
+
+#~ msgid "Customize"
+#~ msgstr "PersonliggЬr"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "фndr vФrktЬjslinjerne"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Slet opgaven"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Gem opgave som noget andet"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Kom i gang"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Brug af kalenderen"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Brug af postdelen"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Aftale (RETMIG)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakt (RETMIG)"
+
+#~ msgid "_Index"
+#~ msgstr "_Indeks"
+
+#~ msgid "_Mail message"
+#~ msgstr "Send besked"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "Opgave (RETMIG)"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Indstillinger for _post..."
+
 #, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "фndr opsФtning"
@@ -12001,9 +14098,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Alarms timeout after"
 #~ msgstr "Alarmer afbrydes efter"
 
-#~ msgid "Colors"
-#~ msgstr "Farver"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "SlЕ udsФttelse til for"
 
@@ -12022,9 +14116,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Overdue Items:"
 #~ msgstr "Overskredne opgaver:"
 
-#~ msgid "TaskPad"
-#~ msgstr "Opgaveblok"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Tid til afslutning"
 
@@ -12049,9 +14140,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ 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"
 
@@ -12111,13 +14199,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ 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"
 
@@ -12193,9 +14274,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ "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"
 
@@ -12211,9 +14289,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Move %s to the right"
 #~ msgstr "Flyt %s til hЬjre"
 
-#~ msgid "RDF Summary"
-#~ msgstr "RDF-sammendrag"
-
 #~ msgid "Test service"
 #~ msgstr "Testtjeneste"
 
@@ -12235,9 +14310,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ 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"
 
@@ -12256,18 +14328,15 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ 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>"
+#~ "-----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>"
+#~ "-----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"
@@ -12287,9 +14356,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Activate this shortcut"
 #~ msgstr "AktivИr denne genvej"
 
-#~ msgid "Find"
-#~ msgstr "Find"
-
 #~ msgid "Find a contact"
 #~ msgstr "Find kontakt"
 
@@ -12305,9 +14371,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "Opret en ny kalender"
 
-#~ msgid "Day"
-#~ msgstr "Dag"
-
 #~ msgid "Open Calendar"
 #~ msgstr "еbn kalender"
 
@@ -12332,9 +14395,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "Adresse_bog..."
 
-#~ msgid "C_lear"
-#~ msgstr "T_Ьm"
-
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "_Tjek navne"
 
@@ -12380,9 +14440,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Select everything"
 #~ msgstr "VФlg alt"
 
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "_OpgaveforespЬrgsel"
-
 #~ msgid "_About..."
 #~ msgstr "_Om..."
 
@@ -12416,12 +14473,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ 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"
@@ -12444,9 +14495,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "_IndsФt tekstfil... (RETMIG)"
 
-#~ msgid "Assig_n Task (FIXME)"
-#~ msgstr "_Tildel opgave (RET)"
-
 #~ msgid "Redo"
 #~ msgstr "Gentag"
 
@@ -12526,9 +14574,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Display all of the message headers"
 #~ msgstr "Vis komplette beskedshoveder"
 
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "Skjul slettede beskeder"
-
 #~ msgid "Print Preview of message..."
 #~ msgstr "Vis udskrift af besked..."
 
@@ -12549,9 +14594,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "_Reply"
 #~ msgstr "_Svar"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "_Gem besked som..."
-
 #~ msgid "_Threaded"
 #~ msgstr "_TrЕdet"
 
@@ -12559,10 +14601,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Avanceret..."
 
 #, fuzzy
-#~ msgid "Click here to add a contact"
-#~ msgstr "* Klik her for at tilfЬje en kontakt *"
-
-#, fuzzy
 #~ msgid "_Compose"
 #~ msgstr "Skriv"
 
@@ -12571,8 +14609,8 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 
 #, fuzzy
 #~ 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 valg vil lade dig koble til en IMAP-tjener ved at bruge en "
 #~ "klartekst-adgangskode."
@@ -12602,20 +14640,18 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 
 #, fuzzy
 #~ msgid ""
-#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
-#~ "also be used to retrieve mail from certain web mail providers and "
+#~ "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. POP-protokollen kan ogsЕ bruges for at hente "
-#~ "e-post fra visse e-postudbydere via web, samt fra proprietФre e-postsystemer."
-
-#~ msgid "Secure SMTP"
-#~ msgstr "Sikker SMTP"
+#~ "For tilkobling til POP-tjenere. POP-protokollen kan ogsЕ bruges for at "
+#~ "hente e-post fra visse e-postudbydere via web, samt fra proprietФre e-"
+#~ "postsystemer."
 
 #, fuzzy
 #~ 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 af e-post via en ekstern e-posttjener med SMTP.\n"
 
 #, fuzzy
@@ -12623,8 +14659,8 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ "This option will connect to the SMTP server without using any kind of "
 #~ "authentication. This should be fine for connecting to most SMTP servers."
 #~ msgstr ""
-#~ "Dette alternativ lader dig koble til POP-tjeneren ved brug af adgangskode i "
-#~ "klartekst. Dette er det eneste alternativ som er understЬttet af mange "
+#~ "Dette alternativ lader dig koble til POP-tjeneren ved brug af adgangskode "
+#~ "i klartekst. Dette er det eneste alternativ som er understЬttet af mange "
 #~ "POP-tjenere."
 
 #, fuzzy
@@ -12643,10 +14679,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Udefineret"
 
 #, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Avanceret..."
-
-#, fuzzy
 #~ msgid "Email address:"
 #~ msgstr "Epostadresse:"
 
@@ -12673,14 +14705,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Mail Account"
 #~ msgstr "Konto"
 
-#, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Konfiguration af epost"
-
-#, fuzzy
-#~ msgid "Password:"
-#~ msgstr "Adgangskode"
-
 #~ msgid "Plain Text"
 #~ msgstr "Vanlig tekst"
 
@@ -12697,10 +14721,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "_NЬdvendig deltager"
 
 #, fuzzy
-#~ msgid "Server type:"
-#~ msgstr "Tjenertype:"
-
-#, fuzzy
 #~ msgid "Transport"
 #~ msgstr "Gennemsigtig"
 
@@ -12929,18 +14949,10 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "OpsФtning af kalender"
 
 #, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "Udskriv denne kalender"
-
-#, fuzzy
 #~ msgid "Create Rule"
 #~ msgstr "Skab regel fra besked"
 
 #, fuzzy
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "FiltrИr efter afsender"
-
-#, fuzzy
 #~ msgid "Filter on Rec_ipients"
 #~ msgstr "FiltrИr efter modtager"
 
@@ -12953,10 +14965,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Svar til afsender"
 
 #, fuzzy
-#~ msgid "Show _All Messages"
-#~ msgstr "Vis _alt"
-
-#, fuzzy
 #~ msgid "_Filter on Subject"
 #~ msgstr "FiltrИr efter emne"
 
@@ -13001,30 +15009,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ " %s"
 
 #, fuzzy
-#~ msgid "Body or subject contains"
-#~ msgstr "Kommentar indeholder"
-
-#, fuzzy
-#~ msgid "Body contains"
-#~ msgstr "indeholder"
-
-#, fuzzy
-#~ msgid "Subject contains"
-#~ msgstr "Navn indeholder"
-
-#, fuzzy
-#~ msgid "Body does not contain"
-#~ msgstr "indeholder ikke"
-
-#, fuzzy
-#~ msgid "Subject does not contain"
-#~ msgstr "indeholder ikke"
-
-#, fuzzy
-#~ msgid "Sender contains"
-#~ msgstr "Navn indeholder"
-
-#, fuzzy
 #~ msgid "Connect to server"
 #~ msgstr "Opkobler til server..."
 
@@ -13094,10 +15078,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Fjerner abonnement pЕ mappe \"%s\""
 
 #, fuzzy
-#~ msgid "Display folders whose name contain:"
-#~ msgstr "Vis mapper som som starter med:"
-
-#, fuzzy
 #~ msgid "Query"
 #~ msgstr "Hver"
 
@@ -13199,30 +15179,14 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "_еbn..."
 
 #, fuzzy
-#~ msgid "Days"
-#~ msgstr "Dag"
-
-#, fuzzy
-#~ msgid "Hours"
-#~ msgstr "timer"
-
-#, fuzzy
 #~ msgid "Mail _to:"
 #~ msgstr "Send til %s"
 
 #, fuzzy
-#~ msgid "Minutes"
-#~ msgstr "minutter"
-
-#, fuzzy
 #~ msgid "_Audio"
 #~ msgstr "_TilfЬj"
 
 #, fuzzy
-#~ msgid "_Mail"
-#~ msgstr "_Mobil"
-
-#, fuzzy
 #~ msgid "_Program"
 #~ msgstr "Fremskridt"
 
@@ -13262,7 +15226,8 @@ msgstr "init_bonobo(): Kunne ikke initiere 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."
 
 #, fuzzy
 #~ msgid "Retrieving message %d of %d"
@@ -13292,10 +15257,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Kunne ikke indlФse opgaverne i '%s'"
 
 #, fuzzy
-#~ msgid "Hide selected"
-#~ msgstr "Skjul valgte beskeder"
-
-#, fuzzy
 #~ msgid "Hide deleted"
 #~ msgstr "Skjul slettede beskeder"
 
@@ -13341,12 +15302,13 @@ msgstr "init_bonobo(): Kunne ikke initiere 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."
 
 #, fuzzy
 #~ msgid "Full name:"
@@ -13361,48 +15323,51 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Filtype:"
 
 #~ 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."
 
 #, fuzzy
 #~ msgid "News source type:"
 #~ msgstr "Ny telefontype"
 
 #~ 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."
 
 #, fuzzy
 #~ msgid "Add Identity"
@@ -13484,7 +15449,8 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Videresendt meddelelse - %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."
@@ -13504,10 +15470,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Rebuilding message view"
 #~ msgstr "Sender meddelelse"
 
-#, fuzzy
-#~ msgid "Rebuild message view"
-#~ msgstr "HjФlpebesked"
-
 #~ msgid "Note: When converting between mailbox formats, a failure\n"
 #~ msgstr "Merk: Ved konvertering mellom postboksformater, kan en feil\n"
 
@@ -13556,9 +15518,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Load \"%s\""
 #~ msgstr "Last \"%s\""
 
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "SynkronisИr \"%s\""
-
 #, fuzzy
 #~ msgid "Displaying message UID \"%s\""
 #~ msgstr "Kopierer beskeder til %s"
@@ -13629,10 +15588,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "_Save Calendar As"
 #~ msgstr "Gem kalender"
 
-#, fuzzy
-#~ msgid "may"
-#~ msgstr "dag"
-
 #~ msgid "sept"
 #~ msgstr "sept"
 
@@ -13746,8 +15701,8 @@ msgstr "init_bonobo(): Kunne ikke initiere 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."
 
 #, fuzzy
 #~ msgid "Could not rename folder %s to %s: destination exists"
@@ -13810,10 +15765,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Kunne ikke udfЬre %s: besked ikke sendt."
 
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr "Kan ikke initialisere Evolutions e-postkomponent."
-
-#, fuzzy
 #~ msgid "_New appointment..."
 #~ msgstr "Ny aftale..."
 
@@ -13871,10 +15822,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Tidsformat:"
 
 #, fuzzy
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 timer (AM/PM)"
-
-#, fuzzy
 #~ msgid "24-hour"
 #~ msgstr "24 timer"
 
@@ -13984,10 +15931,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "_Send inn feilrapport"
 
 #, fuzzy
-#~ msgid "Send _Now"
-#~ msgstr "Afsend"
-
-#, fuzzy
 #~ msgid "Custom search"
 #~ msgstr "Egendefineret genindtrФffelse"
 
@@ -14036,10 +15979,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ "Dager\n"
 
 #, fuzzy
-#~ msgid "Daily"
-#~ msgstr "Dag"
-
-#, fuzzy
 #~ msgid "Weekly"
 #~ msgstr "Uge"
 
@@ -14108,9 +16047,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "FIXME: Assign Task..."
 #~ msgstr "Tildel oppgave..."
 
-#~ msgid "Assign the task to someone"
-#~ msgstr "Tildel oppgaven til noen"
-
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "Ka_lender..."
 
diff --git a/po/de.po b/po/de.po
index 1c21dededd..d1b47f3846 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,10 +7,11 @@
 # task = Aufgabe (Auftrag klingt nach Buchhaltung)
 # mailbox = Postfach (dt. Mailbox ist die эbersetzung von "BBS")
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.8cvs\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -26,11 +27,11 @@ msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
 msgid "Imports VCard files into Evolution."
 msgstr "Importiert VCard-Dateien in Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Karte: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -38,7 +39,7 @@ msgstr ""
 "\n"
 "Name: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -46,7 +47,7 @@ msgstr ""
 "\n"
 "  PrДfix:     "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -54,7 +55,7 @@ msgstr ""
 "\n"
 "  Vorname:     "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -62,7 +63,7 @@ msgstr ""
 "\n"
 "  ZusДtzlich: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -70,7 +71,7 @@ msgstr ""
 "\n"
 "  Familienname:     "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -78,7 +79,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -86,7 +87,7 @@ msgstr ""
 "\n"
 "Geburtsdatum: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -94,7 +95,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -102,7 +103,7 @@ msgstr ""
 "\n"
 "  Postfach:  "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -110,7 +111,7 @@ msgstr ""
 "\n"
 "  Suffix:        "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -118,7 +119,7 @@ msgstr ""
 "\n"
 "  Straъe:     "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -126,7 +127,7 @@ msgstr ""
 "\n"
 "  Ort:     "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -134,7 +135,7 @@ msgstr ""
 "\n"
 "  Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -142,7 +143,7 @@ msgstr ""
 "\n"
 "  Postleitzahl: "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -150,7 +151,7 @@ msgstr ""
 "\n"
 "  Land:     "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -158,7 +159,7 @@ msgstr ""
 "\n"
 "Postvermerk: "
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -166,7 +167,7 @@ msgstr ""
 "\n"
 "Telefone:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -174,7 +175,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -182,7 +183,7 @@ msgstr ""
 "\n"
 "E-Mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -190,7 +191,7 @@ msgstr ""
 "\n"
 "E-Mail:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -198,7 +199,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -206,7 +207,7 @@ msgstr ""
 "\n"
 "Zeitzone: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -214,7 +215,7 @@ msgstr ""
 "\n"
 "Geographischer Ort: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -222,7 +223,7 @@ msgstr ""
 "\n"
 "Berufsbezeichnung: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -230,7 +231,7 @@ msgstr ""
 "\n"
 "Firma: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -238,7 +239,7 @@ msgstr ""
 "\n"
 "  Name:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -246,7 +247,7 @@ msgstr ""
 "\n"
 "  Einheit:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -254,7 +255,7 @@ msgstr ""
 "\n"
 "  Einheit2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -262,7 +263,7 @@ msgstr ""
 "\n"
 "  Einheit3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -270,7 +271,7 @@ msgstr ""
 "\n"
 "  Einheit4: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -278,7 +279,7 @@ msgstr ""
 "\n"
 "Kategorien: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -296,7 +297,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -304,7 +305,7 @@ msgstr ""
 "\n"
 "Eindeutige Zeichenkette: "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -325,8 +326,8 @@ msgstr "VCard fЭr %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -341,20 +342,20 @@ msgstr "Cursor konnte nicht geladen werden\n"
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
@@ -402,195 +403,204 @@ msgstr "Factory fЭr die Evolution-Adressbuch-Komponente."
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory fЭr die beispielhafte Adressbuch-Kontrolle"
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP-Server"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Datei"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Unbekannter Adressbuch-Typ"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Kein (Anonymer Modus)"
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
+msgstr "Kontakte"
 
-#: 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 "Passwort"
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Fehler beim Laden von Filterinformation:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Unbekannter Legitimationstyp"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Neuer Kontakt:"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Basis"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Neuer Kontakt:"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Ein"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Neuer Kontakt:"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Unterbaum"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Neuer Kontakt:"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Unbekannter Bereichstyp"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Adressbuch bearbeiten"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "DN binden:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME DN-Bindungs-Hilfetext hier"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Account"
 
-#. 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 "Dieses Passwort speichern"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
+msgstr "Adressbuch hinzufЭgen"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "Host-Rechner:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Adressbuch-Quellen"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Host-Rechner-Hilfetext hier."
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Komplex..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Root-DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Basis"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Root-DN-Hilfetext hier."
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Grundlagen"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Port:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "De_lete"
+msgstr "_LЖschen"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Port-Hilfetext hier."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "Ein"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 msgstr "Suche-Bereich:"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Legitimation:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Komplexe LDAP-Optionen"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
-msgstr "Pfad:"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Suche-Bereich:"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Pfad-Hilfetext hier"
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "Namen wДhlen"
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "Pfad erstellen wenn er noch nicht existiert."
+#: addressbook/gui/component/addressbook-config.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "So"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "Adressbuch bearbeiten"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "Adressbuch hinzufЭgen"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"WДhlen Sie den Typ ihres Adressbuches und geben Sie die relevanten "
-"Informationen ein."
-
-#: 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:692
-msgid "FIXME Name help text here"
-msgstr "FIXME Hilfetext zum Namen 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 "Beschreibung:"
-
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
-msgstr "FIXME Hilfetext zur Beschreibung hier"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Adressbuch-Quellen"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "De_lete"
-msgstr "_LЖschen"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr "Name"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
-msgstr "URI"
+#: addressbook/gui/component/addressbook-config.glade.h:21
+#, fuzzy
+msgid "_Account name:"
+msgstr "Accountverwaltung"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "HinzufЭgen"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Server benЖtigt Legitimation"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Server-Nachricht:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "Andere Kontakte"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "Bitte geben Sie das Passwort fЭr %s ein"
+#: addressbook/gui/component/addressbook.c:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Bitte geben Sie Ihr Passwort fЭr %s ein"
+
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Legitimation"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "E-Mail-Adresse:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Passwort"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch kann nicht geЖffnet werden"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -600,7 +610,7 @@ msgstr ""
 "bedeutet entweder, dass Sie einen ungЭltigen URI eingegeben\n"
 "haben oder dass der LDAP-Server unerreichbar ist."
 
-#: addressbook/gui/component/addressbook.c:385
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -613,7 +623,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -621,41 +631,66 @@ msgstr ""
 "Dieses Adressbuch konnte nicht geЖffnet werden. Bitte prЭfen Sie\n"
 "nach, ob der Pfad existiert und ob Sie darauf zugreifen dЭrfen."
 
-#: addressbook/gui/component/addressbook.c:554
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Irgend ein Feld enthДlt"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Name enthДlt"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "E-Mail enthДlt"
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Category contains"
-msgstr "Kategorie enthДlt"
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
+#, fuzzy
+msgid "Category is"
+msgstr "Kategorien"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Komplex..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Kategorie:"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:912
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "PrimДre 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "E-Mail 3"
 
@@ -677,19 +712,19 @@ msgstr "Adresse zu bestehendem Kontakt \"%s\" hinzufЭgen"
 msgid "Querying Addressbook..."
 msgstr "Anfrage beim Adressbuch..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Kontaktinfo bearbeiten"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Zu Kontakten hinzufЭgen"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "E-Mail-Adresse einflieъen lassen"
 
@@ -710,13 +745,10 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory fЭr die Namenauswahl-Schnittstelle des Adressbuchs"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:630
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -728,35 +760,55 @@ msgstr "Alle Entfernen"
 msgid "Send HTML Mail?"
 msgstr "HTML-Mail verschicken?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 "Lokaler Speicher kann nicht erreicht werden. Dies sollte nie passieren."
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "NachrichtenempfДnger"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "enthДlt"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Namen wДhlen"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "Kontakte"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "Name aus _Ordner wДhlen:"
+#, fuzzy
+msgid "F_ind"
+msgstr "Suchen:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "Namen wДhlen"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
 msgstr "_Kategorie:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Suchen"
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "_Ordner"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "NachrichtenempfДnger"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -771,8 +823,8 @@ msgid "Business _Fax"
 msgstr "GeschДftliches Fax"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Kategorien..."
 
@@ -781,16 +833,16 @@ msgid "Contact Editor"
 msgstr "Kontakteditor"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Details"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Einsortieren unter:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Allgemein"
 
@@ -814,239 +866,1245 @@ msgstr "Telefon-Typen"
 msgid "Wants to receive _HTML mail"
 msgstr "Will HTML-Mail erhalten"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Adresse der Webseite:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "Adresse..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "Name des Assistenten:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "Geburtstag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "GeschДftlich"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "Kontakte..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "LЖschen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "Abteilung:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "Voller Name..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "Zu Hause"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "Stellenbezeichnung:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Name des Vorgesetzten:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "Spitzname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "BЭro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "Beruf:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "Partner:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "Dies ist die Postadresse"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Adresse der Webseite:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Kontakt lЖschen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehЖrt in folgende Kategorien:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "GeschДftlich"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "GeschДftlich 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "GeschДftliches Fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "RЭckruf"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Zu Hause"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Andere"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "PrimДr"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Funk"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Ordner-Zusammenfassungsdatei `%s' konnte nicht gelЖscht werden: %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufЭgen"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Voll bearbeiten"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Voller Name"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "E-Mail"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Assistent"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Automatisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Ausrichtung"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "August"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "Jahre"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "GrЖъe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Verschicken"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#, fuzzy
+msgid "Bouvet Island"
+msgstr "MДъiger Sand"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Hagel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Auto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Adresse prЭfen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Chinesisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Chinesisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Erstellen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Kopiere"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "Land:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finnland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Abbrechen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "Griechisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finnland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "AM"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Allgemein"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Hagel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "Stunden"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Sonntag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#, fuzzy
+msgid "Ireland"
+msgstr "Koreanisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+#, fuzzy
+msgid "Japan"
+msgstr "Japanisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#, fuzzy
+msgid "Jordan"
+msgstr "Koreanisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Am niedrigsten"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Am niedrigsten"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "englisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#, fuzzy
+msgid "Lithuania"
+msgstr "Leichter Hagel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "MДrz"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Mail"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Mail"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Mail"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#, fuzzy
+msgid "Marshall Islands"
+msgstr "Teils Sand"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "RДnder"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Mai"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Montag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Mobil"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Vorgesetzter"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Antworten"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "_Strang auswДhlen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Neuer Kontakt:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "HЖher"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "englisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "Minute"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Jetzt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "EinfЭgen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finnland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Hochformat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "nach"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Regionen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Rauch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Allgemein"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "Ansetzen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Sand"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "So"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Spitzname"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finnland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Gelesen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Regen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Aufgabenliste"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finnland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "An"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Tornado"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Di"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "TЭrkisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ukrainisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Unbenannte Nachricht"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Namen wДhlen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#, fuzzy
+msgid "Western Sahara"
+msgstr "WesteuropДisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Gelesen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "Ort:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Postfach:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Staat/Bundesland:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "Postleitzahl/_ZIP:"
 
@@ -1137,6 +2195,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "Adressen _verbergen, when Mail an diese Liste gesendet wird"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "_Entfernen"
 
@@ -1145,7 +2204,7 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 msgid "Contact List Editor"
 msgstr "Kontaktlisten-Editor"
 
@@ -1154,7 +2213,7 @@ msgid "Add Anyway"
 msgstr "Trotzdem hinzufЭgen"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: 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:4
 msgid "Duplicate Contact Detected"
 msgstr "Doppelt vorhandener Kontakt entdeckt"
 
@@ -1175,14 +2234,19 @@ msgstr ""
 "bereits in diesem Ordner. MЖchten Sie ihn trotzdem hinzufЭgen?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Change Anyway"
+msgstr "Trotzdem _Дndern"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "GeДnderter Kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "Kontakt in Konflikt:"
 
-#: 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:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1191,12 +2255,13 @@ msgstr ""
 "Kontakts gibt es bereits in diesem Ordner. MЖchten Sie ihn\n"
 "trotzdem hinzufЭgen?"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
-msgid "_Change Anyway"
-msgstr "Trotzdem _Дndern"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "Komplexe Suche"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Suchen"
 
@@ -1308,42 +2373,52 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
-msgid "Send contact to other"
-msgstr "Kontakt an anderen schicken"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "жffnen"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Als _Anlage weiterleiten"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 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:63 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Drucken"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 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: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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "LЖschen"
 
@@ -1358,7 +2433,8 @@ msgid "Success"
 msgstr "Erfolg"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -1366,7 +2442,7 @@ msgstr "Unbekannter Fehler"
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
@@ -1383,8 +2459,12 @@ msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstЭtzt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-msgid "Canceled"
-msgstr "Abgebrochen"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
+msgstr "Storniert"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Other error"
@@ -1407,131 +2487,131 @@ msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Hier klicken, um einen Kontakt hinzuzufЭgen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "PrimДres Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Telefon des Assistenten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "GeschДftliches Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "RЭckruf-Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Firmentelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Telefon zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "GeschДftliche Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Adresse zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "GeschДftliches Telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Telefon zu Hause 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Anderes Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Andere Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Abteilung"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "BЭro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Beruf"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Lebenspartner"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Notiz"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "VerfЭgbarkeits-Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "Fertig."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr "Karten werden entfernt..."
 
@@ -1725,6 +2805,23 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Kalender drucken"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Kalender drucken"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Umschlag drucken"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1876,7 +2973,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "GNOME konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
@@ -1884,151 +2981,142 @@ 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:402
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %d. %B %Y"
 
-#: calendar/gui/calendar-commands.c:586
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d. %B"
+
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte ЭberprЭfen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: 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:308
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 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"
-msgstr "Unbekannt"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "жffentlich"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "W"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Hoch"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Niedrig"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "Griechisch"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "BeschДftigt"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: 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 "Storniert"
-
 #. 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2039,29 +3127,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:981
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-"Die Klassifizierung muss 'жffentlich', 'Privat', 'Vertraulich' oder 'Keine' "
-"sein"
-
-#. 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 "Keine"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2071,43 +3137,50 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschlieъlich) sein"
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Die PrioritДt muss 'Hoch', 'Normal', 'Niedrig' oder 'Undefiniert' sein."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "Die Transparenz muss 'Transparent', 'Opak' oder 'Keine' sein."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Nein"
 
@@ -2127,27 +3200,86 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Summary contains"
+msgstr "E-Mail enthДlt"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "Beschreibung:"
+
+#: calendar/gui/cal-search-bar.c:58
+#, fuzzy
+msgid "Comment contains"
+msgstr "Name enthДlt"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Kalender"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "VOrdner Эber Mailingliste"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Einen neuen Termin anlegen"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Neuer Termin"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Eine neue Aufgabe anlegen"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Neue Aufgabe"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr "Audio-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr "Nachrichten-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr "Mail-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr "Programm-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr "Unbekannte Alarmoptionen"
 
@@ -2195,109 +3327,115 @@ msgstr "Stunden"
 msgid "minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 Tag"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 Woche"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 Sekunde"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Eine Nachricht anzeigen"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ein Programm ausfЭhren"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 msgid "before start of appointment"
 msgstr "vor Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 msgid "after start of appointment"
 msgstr "nach Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 msgid "before end of appointment"
 msgstr "vor Terminende"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 msgid "after end of appointment"
 msgstr "nach Terminende"
 
 #: 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/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr "Grundlagen"
 
 #: 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 "Datum/Zeit:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Erinnerungen"
 
 #: 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -2305,12 +3443,11 @@ msgstr "Zusammenfassung:"
 msgid "_Options..."
 msgstr "_Optionen..."
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "nach"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "vor"
 
@@ -2327,7 +3464,7 @@ msgstr "Ende des Termins"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -2344,193 +3481,226 @@ msgid "10 minutes"
 msgstr "10 Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 Stunden (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 Stunden"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 Minuten"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "_Kalender-Einstellungen..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr "Farbe fЭr ЭberfДllige Aufgaben"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Piepsen, wenn Alarmfenster erscheinen."
+msgid "Color for tasks due today"
+msgstr "Farbe fЭr heute fДllige Aufgaben"
 
 #: 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"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Einen neuen Termin anlegen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "Kalender-Vorlieben"
+#, fuzzy
+msgid "Days"
+msgstr "Tage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr "Farbe fЭr ЭberfДllige Aufgaben"
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Erster Tag der Woche:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr "Farbe fЭr heute fДllige Aufgaben"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "Freitag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr "Farben fЭr Aufgaben"
+#, fuzzy
+msgid "Hours"
+msgstr "Stunden"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
-msgstr "Wochenenden in Monatsansicht komprimieren"
+#, fuzzy
+msgid "Minutes"
+msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
-msgstr "Datumsnavigator"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Montag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Voreinstellungen"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "эberfДllige Aufgaben"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "Anzeige"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "Samstag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Ende des Tages:"
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "Endzeiten von Terminen in Wochen- und Monatsansichten zeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "Erster Tag der Woche:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Wochennummern zeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Fr"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "Anfang des Tages:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Freitag"
+#, fuzzy
+msgid "Su_n"
+msgstr "So"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Sonntag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "Mo"
+#, fuzzy
+msgid "T_hu"
+msgstr "Do"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Montag"
+#, fuzzy
+msgid "T_ue"
+msgstr "Di"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr "Benachrichtigungsoptionen"
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Heute fДllige Aufgaben"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
-msgstr "эberfДllige Aufgaben"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Donnerstag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Mich an alle Termine erinnern,"
+msgid "Time"
+msgstr "Zeit"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr "Zeitzone:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "Sa"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Zeit-Unterteilungen:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "Samstag"
+msgid "Time format:"
+msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Show appointment end times in week and month views"
-msgstr "Endzeiten von Terminen in Wochen- und Monatsansichten zeigen"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Dienstag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Wochennummern zeigen"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Mittwoch"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "Anfang des Tages:"
+#: ui/evolution-calendar.xml.h:33
+msgid "Work Week"
+msgstr "Werkwoche"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "So"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 Stunden (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Sonntag"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 Stunden"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Task List"
-msgstr "Aufgabenliste"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
-msgstr "Heute fДllige Aufgaben"
+#, fuzzy
+msgid "_Compress weekends in month view"
+msgstr "Wochenenden in Monatsansicht komprimieren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "Do"
+#, fuzzy
+msgid "_Display"
+msgstr "Anzeige"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Donnerstag"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Ende des Tages:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Time"
-msgstr "Zeit"
+#, fuzzy
+msgid "_Fri"
+msgstr "Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Zeit-Unterteilungen:"
+#, fuzzy
+msgid "_General"
+msgstr "Allgemein"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Zeitformat:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "_GelЖschte Nachrichten verbergen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Time zone:"
-msgstr "Zeitzone:"
+#, fuzzy
+msgid "_Mon"
+msgstr "Mo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "Di"
+#, fuzzy
+msgid "_Other"
+msgstr "Andere"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Dienstag"
+#, fuzzy
+msgid "_Sat"
+msgstr "Sa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "Mi"
+#, fuzzy
+msgid "_Task List"
+msgstr "Aufgabenliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Mittwoch"
+#, fuzzy
+msgid "_Wed"
+msgstr "Mi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Work Week"
-msgstr "Werkwoche"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "Minuten bevor sie auftreten."
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr "vor Terminbeginn"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2601,61 +3771,56 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine дnderungen gemacht, den Editor aktualisieren?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr " an "
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 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:640 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "FДllig am "
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Datei Эberschreiben?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2663,12 +3828,12 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits.\n"
 "эberschreiben?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version kann nicht erhalten werden!"
 
@@ -2715,42 +3880,35 @@ msgstr "Sind Sie sicher, dass Sie %d Aufgaben lЖschen wollen?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Sind Sie sicher, dass Sie %d JournaleintrДge lЖschen wollen?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr "Eine Zeitzone wДhlen"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "Auswahl:"
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#, fuzzy
+msgid "Addressbook..."
+msgstr "Adressbuch"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Zeitzonen"
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#, fuzzy
+msgid "Delegate To:"
+msgstr "Delegiert an:"
 
-#: 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 ""
-"Benutzen Sie die linke Maustaste, um an einen Bereich der Karte "
-"heranzuzoomen, und wДhlen Sie eine Zeitzone.\n"
-" Mit der rechten Maustaste kЖnnen Sie wegzoomen."
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#, fuzzy
+msgid "Enter Delegate"
+msgstr "GelЖscht"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr "Besprechung"
 
@@ -2758,174 +3916,190 @@ msgstr "Besprechung"
 msgid "A_ll day event"
 msgstr "GanztДgiges Ereignis"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "BeschДftigt"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klassifikation"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Vertraulich"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Datum & Zeit"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "Griechisch"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Privat"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "жffentlich"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Schauer"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "Zusammenfassung:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "Vertraulich"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "_Endzeit:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "VorlДufig"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "GelЖscht"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 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
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "BenЖtigte Information"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Optionale Information"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 msgid "Sent By:"
 msgstr "Verschickt durch:"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -2962,19 +4136,18 @@ msgid "Role"
 msgstr "Position"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
@@ -3018,13 +4191,14 @@ msgstr "am"
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr "Auftreten"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
-msgstr "Benutzerdefinierte Wiederholung"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "A_dd"
+msgstr "HinzufЭgen"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3035,25 +4209,32 @@ msgid "Exceptions"
 msgstr "Ausnahmen"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "No recurrence"
-msgstr "Keine Wiederholung"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Vorschau"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Wiederholungsregel"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Einfache Wiederholung"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Benutzerdefinierte Wiederholung"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "_дndern"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Keine Wiederholung"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Einfache Wiederholung"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "fЭr"
@@ -3100,163 +4281,162 @@ msgstr ""
 "Der Journaleintrag hat sich geДndert. Eine aktualisierte Version schicken?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "Date Completed:"
-msgstr "Abgeschlossen am:"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-msgid "Delegated From:"
-msgstr "Delegiert durch:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% abgeschlossen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Delegated To:"
-msgstr "Delegiert an:"
+msgid "Date Completed:"
+msgstr "Abgeschlossen am:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-msgid "No one"
-msgstr "Niemanden"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "Fortschritt"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Aufgabe"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_PrioritДt:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% abgeschlossen:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "Status:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "Fortschritt"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Zugewiesen"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "Vertraulich"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "FДllig am:"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "_PrioritДt:"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "Status:"
-
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "ж_ffnen"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "EinfЭgen"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Diese Aufgabe lЖschen"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "AusgewДhlte Aufgaben lЖschen"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 msgstr "Hier klicken, um eine Aufgabe hinzuzufЭgen"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% abgeschlossen"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarme"
@@ -3290,22 +4470,22 @@ msgstr "Geographische Lage"
 msgid "Priority"
 msgstr "PrioritДt"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Aufgabensorte"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Transparency"
-msgstr "Transparenz"
-
 #: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
@@ -3317,151 +4497,260 @@ msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3306
-#, fuzzy
-msgid "New _Appointment"
-msgstr "Neuer Termin"
-
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, 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
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Diesen Termin lЖschen"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten beweglich machen"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Dieses Auftreten lЖschen"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Jedes Auftreten lЖschen"
 
-#: 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:617
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Die letzten Besprechungsinformationen erhalten"
+
+#: calendar/gui/e-itip-control.c:618
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Optionale Information"
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
-msgid "This is a meeting request."
-msgstr "Dies ist eine Besprechungsanfrage."
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Besprechung"
 
-#: 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:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
 
-#: 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:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Ende der Besprechung:"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:632
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Die letzten Besprechungsinformationen erhalten"
+
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
 msgstr "Dies ist eine Antwort auf eine Besprechungsanfrage."
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
-msgstr "Dies ist eine Ereignisstornierung."
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Besprechung"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Eine Aktion wДhlen"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
 
-#: 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:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "In Nachricht suchen"
 
-#: 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:665
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
-msgstr "Dies ist eine Aufgabenanfrage."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Information"
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "war nach"
+
+#: calendar/gui/e-itip-control.c:680
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Dies ist eine Anfrage zur neuesten Aufgabeninformation."
 
-#: 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:681
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Antworten"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:691
+#, fuzzy
+msgid "Task Cancellation"
 msgstr "Dies ist eine Aufgabenstornierung."
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Kalendermitteilung"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
 msgstr "Dies sind VerfЭgbarkeitsinformationen."
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "VerfЭgbarkeitsinformationen verЖffentlichen"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr "Dies ist eine Anfrage um VerfЭgbarkeitsinformationen."
 
-#: 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:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "VerfЭgbarkeits-Adresse"
 
-#: 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:723
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr "Dies ist eine Antwort auf eine VerfЭgbarkeitsanfrage."
 
-#: 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:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "VerfЭgbarkeits-Adresse"
 
-#: 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:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Nachricht drucken"
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "Ihre Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Abgeschlossen am:"
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Der Eintrag konnte nicht aus Ihrer Kalenderdatei entfernt werden!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% abgeschlossen"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Sendedatum"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3499,45 +4788,28 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: 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:252
-msgid "Category:"
-msgstr "Kategorie:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Die Aufgaben in `%s' konnten nicht geladen werden"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 "Die Methode, die zum Laden von `%s' benЖtigt wird, ist nicht unterstЭtzt"
 
-#. 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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Neuer Termin..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, 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:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3564,42 +4836,43 @@ msgid "Go To Date"
 msgstr "Zu Datum gehen"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "Go To Today"
+msgstr "Zum _heutigen Tag"
+
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Januar"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "MДrz"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Oktober"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "Zum _heutigen Tag"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr "Ein Organisator muss feststehen."
 
@@ -3755,12 +5028,6 @@ msgstr "Fr"
 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 "Aufgaben"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3794,9 +5061,8 @@ msgid "Print Calendar"
 msgstr "Kalender drucken"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
@@ -3808,7 +5074,7 @@ msgstr "Eintrag drucken"
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "Der URI, den der Aufgabenordner anzeigen wird"
 
@@ -3854,6 +5120,103 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+#, fuzzy
+msgid "contains? expects 2 arguments"
+msgstr "Syntaxfehler in Parametern oder Argumenten"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 "Signieren wird von dieser VerschlЭsselung  nicht unterstЭtzt"
@@ -3917,6 +5280,7 @@ 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%%)"
 
@@ -3953,7 +5317,7 @@ msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim AusfЭhren des Filters: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim AusfЭhren einer Filtersuche: %s: %s"
@@ -3980,12 +5344,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgefЭhrt: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "UngЭltiger Typ in body-contains, Zeichenkette wurde erwartet"
 
@@ -4101,13 +5465,13 @@ msgid "No plaintext to sign."
 msgstr "Kein Klartext zum Signieren."
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Kein Passwort angegeben."
 
 #: 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
@@ -4125,15 +5489,15 @@ msgstr "Kein Klartext zum PrЭfen."
 msgid "Couldn't create temp file: %s"
 msgstr "TemporДre Datei konnte nicht angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "Kein Klartext zum VerschlЭsseln."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Keine EmpfДnger angegeben"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr "Kein codierter Text zum Entziffern."
 
@@ -4169,7 +5533,7 @@ msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
@@ -4180,7 +5544,7 @@ msgstr "(unbekannter Rechner)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
@@ -4312,42 +5676,69 @@ msgstr "Diese Option verbindet zum Server mit einem einfachen Passwort."
 msgid "Unknown authentication state."
 msgstr "Unbekannter Legitimationszustand."
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Passwort"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Quelle"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fehler beim Compilieren eines regulДren Ausdrucks: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' benЖtigt einen Benutzernamen-Teil"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s wird aufgelЖst"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim AuflЖsen eines Namens: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
@@ -4360,12 +5751,12 @@ msgstr "E-Mail-Quelle: Virtueller Ordner"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Zum Lesen von Mail in Form einer Abfrage Эber andere Ordner"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle fЭr Protokoll `%s' verfЭgbar"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4411,7 +5802,7 @@ msgstr "Nachricht konnte nicht dekodiert werden."
 msgid "Failed to verify certificates."
 msgstr "Zertifikate konnten nicht verifiziert werden."
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4421,7 +5812,7 @@ msgstr ""
 "Betreff: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4474,60 +5865,60 @@ msgstr "Nachricht gibt es nicht: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Sie kЖnnen keine Nachrichten aus diesem MЭllordner kopieren."
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unerwartete Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "Antwort des Servers endete zu frЭh."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung fЭr %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 msgid "Folder was destroyed and recreated on server."
 msgstr "Der Ordner wurde zerstЖrt und auf dem Server neu erstellt."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:437
+#: camel/providers/imap/camel-imap-folder.c:435
 msgid "Scanning for changed messages"
 msgstr "Suchen nach geДnderten Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verfЭgbar"
 
-#: camel/providers/imap/camel-imap-folder.c:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr "эberblickinformation fЭr neue Nachrichten wird abgerufen"
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 msgid "Scanning for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
@@ -4540,7 +5931,7 @@ msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 msgid "Could not open cache directory: %s"
 msgstr "Cache-Verzeichnis konnte nicht geЖffnet werden: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Nach neuer Mail sehen"
 
@@ -4548,7 +5939,7 @@ msgstr "Nach neuer Mail sehen"
 msgid "Check for new messages in all folders"
 msgstr "In allen Ordnern nach neuer Mail sehen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Ordner"
 
@@ -4589,7 +5980,7 @@ msgstr ""
 "IMAP-Server %s unterstЭtzt den verlangten Legitimationsmechanismus %s nicht."
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine UnterstЭtzung fЭr Legitimationstyp %s"
@@ -4600,7 +5991,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sBitte geben Sie das IMAP-Passwort fЭr %s@%s ein"
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
@@ -4615,12 +6006,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
@@ -4712,7 +6103,7 @@ msgstr "Nachricht kann nicht an maildir-Ordner angehДngt werden: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4726,7 +6117,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4797,20 +6188,20 @@ msgstr "Maildir-Verzeichnispfad kann nicht geЖffnet werden: %s: %s"
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s kann nicht erzeugt werden: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach kann nicht geЖffnet werden: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht kann nicht an mbox-Datei angehДngt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4822,12 +6213,12 @@ msgstr ""
 "Nachricht kann nicht erhalten werden: %s aus Ordner %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
-#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nachrichtenerstellung fehlgeschlagen: Defektes Postfach?"
@@ -4875,13 +6266,14 @@ msgstr "Ordner `%s' ist nicht leer. Nicht gelЖscht."
 #. 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"
+#, fuzzy
+msgid "Summarizing folder"
 msgstr "Zusammenfassen des Ordners"
 
 #: camel/providers/local/camel-mbox-summary.c:254
 #: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 "Ordner konnte nicht geЖffnet werden: %s: Zusammenfassung wird begonnen bei "
 "Position %ld: %s"
@@ -4893,24 +6285,22 @@ msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fataler Mailparser-Fehler nahe Position %ld in Ordner %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
 msgstr "Zusammenfassung von Ordner kann nicht erstellt werden: %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:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Ordner wird synchronisiert"
 
 #: 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "Ordner konnte nicht zum Zusammenfassen geЖffnet werden: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5014,6 +6404,17 @@ msgstr "Spool-Ordner kЖnnen nicht umbenannt werden"
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner kЖnnen nicht gelЖscht werden"
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Zusammenfassung von Ordner kann nicht erstellt werden: %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Ordner konnte nicht zum Zusammenfassen geЖffnet werden: %s: %s"
+
 #: camel/providers/local/camel-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5107,40 +6508,40 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ".newsrc-Datei fЭr %s konnte nicht geЖffnet oder erstellt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Abrufen der POP-Zusammenfassung"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP-Server konnte nicht auf neue Nachrichten ЭberprЭft werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Ordner konnte nicht geЖffnet werden: Nachrichtenliste war unvollstДndig."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "Keine Nachricht mit UID %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Abrufen der POP-Nachricht %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nachricht konnte nicht abgeholt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nachricht konnte nicht vom POP-Server %s abgerufen werden: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "Keine Nachricht mit UID %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Abrufen der POP-Nachricht %d"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Nachrichtenspeicherung"
@@ -5154,7 +6555,7 @@ msgstr "Mail auf Server belassen"
 msgid "Delete after %s day(s)"
 msgstr "Nach %s Tag(en) lЖschen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5249,7 +6650,7 @@ msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5304,7 +6705,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mailauslieferung Эber das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5312,124 +6713,124 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Zum Ausliefern von Mail Эber einen Mailknotenpunkt im Netz per SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfehler, Befehl nicht erkannt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfehler in Parametern oder Argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Befehl nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "Befehlsparameter nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr "Systemstatus- oder Systemhilfe-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Hilfemeldung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Dienst ist bereit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Dienst schlieъt эbertragungskanal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst nicht verfЭgbar, эbertragungskanal wird geschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "Angeforderte Mailaktion in Ordnung, abgeschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Angeforderte Mailaktion nicht ausgefЭhrt: Postfach nicht verfЭgbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Angeforderte Aktion nicht ausgefЭhrt: Postfach nicht verfЭgbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "Benutzer nicht lokal; probieren Sie es mit <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Angeforderte Aktion nicht ausgefЭhrt: unzureichender Systemspeicher"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Angeforderte Aktion nicht ausgefЭhrt: Speicherzuteilung Эberschritten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Angeforderte Aktion nicht ausgefЭhrt: Postfachname nicht erlaubt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Maileingabe beginnen; Ende mit <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Transaktion fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "Ein PasswordЭbergang ist notwendig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "Legitimationsmechanismus ist zu schwach"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "FЭr den verlangten Legitimationsmechanismus ist VerschlЭsselung erforderlich."
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Zeitweiliger Legitimationsfehlschlag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Legitimation benЖtigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 "SMTP-Server %s unterstЭtzt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sBitte geben Sie das SMTP-Passwort fЭr %s@%s ein"
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5440,129 +6841,129 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-Mailauslieferung Эber %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gЭltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Nachricht verschicken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine EmpfДnger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr "SMTP-BegrЭъung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "ZeitЭberschreitung bei HELO-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO-Antwortfehler: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
-msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "ZeitЭberschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "UngЭltige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "ZeitЭberschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL-FROM-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "ZeitЭberschreitung bei RCPT-TO-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "ZeitЭberschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "ZeitЭberschreitung beim Senden von DATA: Nachrichtenabschluss: %s Mail nicht "
 "verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA-Antwortfehler: Nachrichtenabschluss: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "ZeitЭberschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET-Antwort-Fehler: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "ZeitЭberschreitung bei QUIT-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT-Antwortfehler: %s: nicht fatal"
@@ -5592,7 +6993,7 @@ msgid "%.1fG"
 msgstr "%.1f GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "anlage"
 
@@ -5625,52 +7026,52 @@ msgstr "MIME-Typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "FЭr das Adressbuch hier klicken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Von:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Gebe die EmpfДnger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5701,29 +7102,29 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr "Warnung!"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, Эberschreiben?"
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5731,16 +7132,16 @@ msgstr ""
 "Der EntwЭrfe-Ordner fЭr diesen Zugang konnte nicht geЖffnet werden.\n"
 "MЖchten Sie den vorgegebenen EntwЭrfe-Ordner verwenden?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5749,7 +7150,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5758,7 +7159,7 @@ msgstr ""
 "Datei konnte nicht verkЭrzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5767,16 +7168,17 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution hat ungespeicherte Dateien aus einer vorhergehenden Sitzung "
 "entdeckt.\n"
 "MЖchten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5786,24 +7188,24 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre дnderungen speichern?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Datei Жffnen"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "Datei einfЭgen"
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Erstellungsfenster konnte nicht erzeugt werden."
 
@@ -5832,55 +7234,101 @@ msgstr "Adresskarte"
 msgid "calendar information"
 msgstr "Kalender-Information"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "enthДlt"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "enthДlt nicht"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "enthДlt nicht"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Name enthДlt"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "EmpfДnger"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Name enthДlt"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Name enthДlt"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "enthДlt nicht"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr "%Y-%m-%d"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr "%x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5888,13 +7336,13 @@ 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
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y / %I.%M %p"
 
@@ -5992,7 +7440,7 @@ msgstr "einer zur momentanen Zeit relativen Zeit"
 msgid "Compare against"
 msgstr "Vergleichen mit"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "jetzt"
 
@@ -6004,11 +7452,15 @@ msgstr " in der Vergangenheit"
 msgid "ago"
 msgstr "in der Vergangenheit"
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%d. %b %H.%M"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<hier klicken, um ein Datum zu wДhlen>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Filterregeln"
 
@@ -6030,20 +7482,20 @@ msgstr ""
 "Bitte gehen Sie zurЭck und wДhlen Sie einen gЭltigen Ordner zum Ausliefern "
 "der Mail."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Ordner wДhlen"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Ordner-URI eingeben"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<hier klicken, um einen Ordner zu wДhlen>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6064,62 +7516,51 @@ msgstr "Regelname: "
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Aktionen ausfЭhren"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Kriterium hinzufЭgen"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "Eingang"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "outgoing"
 msgstr "Ausgang"
 
-#: 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 "HinzufЭgen"
-
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Filter bearbeiten"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "VOrdner bearbeiten"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Eingang"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Ausgang"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuelle Ordner"
 
@@ -6143,192 +7584,193 @@ msgstr "mit allen lokalen Ordnern und aktiven Ordnern aus dem Netz"
 msgid "with all local folders"
 msgstr "mit allen lokalen Ordnern"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
 msgstr "Farbe zuweisen"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Anlagen"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "enthДlt"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "GelЖscht"
 
-#: 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
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Entwurf"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "endet mit"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Existiert"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "existiert"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Wichtig"
 
-#: 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
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Mailingliste"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "Nachricht wurde empfangen"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "Nachricht wurde verschickt"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: 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
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Gelesen"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "EmpfДnger"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Beantwortet an"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 msgid "Size (kB)"
 msgstr "GrЖъe (kB)"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "klingt wie"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Herkunfts-Account"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "beginnt mit"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Betreff"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "enthДlt"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "enthДlt nicht"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "endet nicht mit"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "existiert nicht"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "klingt nicht wie"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "beginnt nicht mit"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "endet mit"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "existiert"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "ist grЖъer als"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "ist kleiner als"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "ist nicht"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "ist"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "am oder nach"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "am oder vor"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "klingt wie"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "beginnt mit"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "war nach"
@@ -6358,14 +7800,13 @@ msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Oops. Sie mЭssen mindestens einen Ordner als Quelle angeben."
 
 #: 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importieren"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Mail"
 
@@ -6393,11 +7834,11 @@ msgstr ""
 "Evolution hat GnomeCard-Dateien gefunden.\n"
 "MЖchten Sie sie in Evolution importieren?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6453,163 +7894,184 @@ msgstr "Factory fЭr die Mailzusammenfassungs-Komponente."
 msgid "Mail configuration interface"
 msgstr "Mailkonfigurations-OberflДche"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "VOrdner Эber Mailingliste"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners Дndern"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Nachricht _verschicken"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Nachricht _verschicken"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschaften von \"%s\""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "TemporДres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/folder-browser.c:893
-msgid "Store search as vFolder"
-msgstr "Suche als VOrdner speichern"
+#: mail/folder-browser.c:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "Filter aus Nachricht _erzeugen"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "VOrdner Эber _Betreff"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "VOrdner Эber Absender"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "VOrdner Эber EmpfДnger"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner Эber Mailing_liste"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Filter Эber _Betreff"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Filter Эber _Absender"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Filter Эber _EmpfДnger"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Filter Эber _Mailingliste"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "Nochmals schicken"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "Nachricht drucken..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 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:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr "Als _unwichtig markieren"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "LЖschen rЭckgДngig"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "Absender zu Adressbuch hinzufЭgen"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "_Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filter Эber Mailingliste"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "VOrdner Эber Mailingliste"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter Эber Mailingliste (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VOrdner Эber Mailingliste (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Optionale Information"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Factory, um mbox in Evolution zu importieren."
@@ -6671,15 +8133,15 @@ msgid "Evolution News Editor"
 msgstr "Evolution-News-Editor"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6689,38 +8151,43 @@ msgstr ""
 "\n"
 "MЖchten Sie Ihre дnderungen speichern?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (voreingestellt)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "Sind Sie sicher, dass Sie diesen Account lЖschen wollen?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr "Nicht lЖschen"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr "Account wirklich lЖschen?"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sind Sie sicher, dass Sie diesen News-Account lЖschen wollen?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Evolution-Accountverwaltung"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "_Mail-Einstellungen..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6774,11 +8241,11 @@ msgstr ""
 "Sie mЭssen einen Mailtransport einrichten,\n"
 "bevor Sie Mail erstellen kЖnnen."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Mailtransport-Methode eingestellt"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6786,7 +8253,7 @@ msgstr ""
 "Diese Nachricht hat keinen Betreff.\n"
 "Wirklich verschicken?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6798,38 +8265,37 @@ msgstr ""
 "eine Apparently-To-Kopfzeile hinzufЭgt.\n"
 "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr "Sie mЭssen EmpfДnger angeben, um diese Nachricht zu verschicken."
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Sie mЭssen einen Account einrichten, bevor Sie diese Mail verschicken kЖnnen."
 
-#: mail/mail-callbacks.c:653
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "Am %s schrieb %s:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Weitergeleitete Nachricht:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6837,7 +8303,7 @@ msgstr ""
 "Sie kЖnnen nur im EntwЭrfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6845,25 +8311,42 @@ msgstr ""
 "Sie kЖnnen nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgewДhlt"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Warnung"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Mich nicht mehr fragen"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6872,62 +8355,72 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern Жffnen "
 "wollen?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "Bitte geben Sie unten Ihren Namen und Ihre E-Mail-Adresse an. Die "
 "\"optionalen\" Felder unten mЭssen nicht ausgefЭllt werden, falls Sie diese "
 "Information nicht in der E-Mail, die Sie verschicken, einschlieъen wollen."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Bitte geben Sie unten Informationen Эber Ihren Server fЭr eingehende Mail "
 "an. Falls Sie nicht wissen, was fЭr einen Server Sie verwenden, wenden Sie "
 "sich an Ihren Systemadministrator oder Internetprovider."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Bitte geben Sie unten Informationen Эber Ihr Protokoll fЭr ausgehende Mail "
 "an. Falls Sie nicht wissen, welches Protokoll Sie verwenden, wenden Sie sich "
 "an Ihren Systemadministrator oder Internetprovider."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "Sie haben Ihre Mailkonfiguration fast abgeschlossen. Die IdentitДt, der "
 "Server fЭr eingehende und das Protokoll fЭr ausgehende Mail, die sie "
@@ -6936,81 +8429,88 @@ msgstr ""
 "wird nur fЭr die Bildschirmanzeige verwendet."
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Evolution-Account-Druide"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Inbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr " PrЭfen, welche Typen unterstЭtzt werden "
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " Farbe"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL wird von dieser BinДrversion von Evolution nicht unterstЭtzt)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Account-Information"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Accountverwaltung"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "ZugДnge"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschlЭsselter Mail immer vor mir selber verschlЭsseln"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 "Beim Verschicken verschlЭsselter Mail immer vor mir selber verschlЭsseln"
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
-msgstr "Bilder immer aus dem Netz laden"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
+msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anlage"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr "Automatisch nach neuer Mail sehen alle"
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr "Kennung des Zertifikats:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Maileditor"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7028,270 +8528,253 @@ msgstr ""
 "Klicken Sie auf \"Beenden\", um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr "Vorgegebener Weiterleitungsstil ist: "
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+#, fuzzy
+msgid "Default character encoding: "
 msgstr "Vorgegebener Zeichensatz: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr "Digitale Kennungen..."
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Anzeige"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "EntwЭrfe"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "EntwЭrfe-Ordner:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Bearbeiten..."
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "E_nable"
+msgstr "Aktivieren"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "E-Mail-Adresse:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Die aktuelle Datei unter anderem Namen speichern"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr "MЭllordner beim Beenden leeren"
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Bearbeiten..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Voller Name:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Digitale Kennung erhalten..."
 
-#: mail/mail-config.glade.h:42
-msgid "HTML Signature:"
+#: mail/mail-config.glade.h:35
+#, fuzzy
+msgid "HTML signature file:"
 msgstr "HTML-Signatur:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr "Zitate hervorheben mit"
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "IdentitДt"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "In HTML-Mail"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr "Bilder laden, falls Absender im Adressbuch ist"
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Mailkonfiguration"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Make this my _default account"
 msgstr "Dies zu meinem Standardaccount machen"
 
-#: mail/mail-config.glade.h:54
-msgid "Mark messages as Read after"
-msgstr "Nachrichten als gelesen markieren nach"
+#: mail/mail-config.glade.h:45
+#, fuzzy
+msgid "Message _preview should be displayed by default"
+msgstr "Nachrichtenvorschau sollte per Vorgabe angezeigt werden"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Message list should display in a _threaded fashion by default"
 msgstr "Nachrichtenliste sollte per Vorgabe zu Threads geordnet sein"
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
-msgstr "Nachrichtenvorschau sollte per Vorgabe angezeigt werden"
-
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "NNTP-Server:"
 
-#: mail/mail-config.glade.h:59
-msgid "Never load images off the net"
-msgstr "Bilder nie aus dem Netz laden"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Nachrichten"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Optionale Information"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "PGP-SchlЭsselkennung:"
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr "Pfad zur PGP-BinДrdatei:"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Eine Farbe auswДhlen"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:72
-msgid "Prompt when sending messages with an empty subject"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Prompt when sending messages with an _empty subject"
 msgstr "Beim Abschicken von Nachrichten ohne Betreff nachfragen"
 
-#: mail/mail-config.glade.h:73
-msgid "Prompt when sending messages with only Bcc recipients defined"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschlieъlich BCC-EmpfДngern nachfragen"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail-maildir "
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "Umschrieben"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Erhalten von E-Mail"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "ERhalten von Mail"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Empfangs-Optionen"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr "PGP-Passphrase bis zum Beenden behalten"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "BenЖtigte Information"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "Sichere MIME"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Sicherheit"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Eine Datei wДhlen"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP-BinДrdatei wДhlen"
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
-msgstr "Mail normalerweise im HTML-Format verschicken."
-
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Verschicken von E-Mail"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Verschicken von Mail"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Verschickt"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Nachrichten in \"Verschickt\" und \"EntwЭrfe\""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Ordner fЭr verschickte Nachrichten:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "Server benЖtigt Legitimation"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Signaturdatei:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Quelle"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Quellinformation"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Quellen"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Besondere Ordner"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix-mbox"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use secure connection (_SSL)"
 msgstr "Sichere Verbindung (SSL) verwenden"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7299,15 +8782,124 @@ msgstr ""
 "\n"
 "Klicken Sie \"Weiter\" zum Beginnen."
 
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "_Always load images off the net"
+msgstr "Bilder immer aus dem Netz laden"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "Automatisch nach neuer Mail sehen alle"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr " PrЭfen, welche Typen unterstЭtzt werden "
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "E-Mail-Adresse:"
+
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Empty trash folders on exit"
+msgstr "MЭllordner beim Beenden leeren"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Voller Name:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "HTML-Signatur:"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "Zitate hervorheben mit"
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "Host-Rechner:"
+
+#: mail/mail-config.glade.h:102
+#, fuzzy
+msgid "_Load images if sender is in addressbook"
+msgstr "Bilder laden, falls Absender im Adressbuch ist"
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "Nachrichten als gelesen markieren nach"
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "Name:"
+
+#: mail/mail-config.glade.h:106
+#, fuzzy
+msgid "_Never load images off the net"
+msgstr "Bilder nie aus dem Netz laden"
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Organisation:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "Pfad zur PGP-BinДrdatei:"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Pfad:"
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "_Remember PGP Passphrase until exit"
+msgstr "PGP-Passphrase bis zum Beenden behalten"
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Dieses Passwort speichern"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Mail normalerweise im HTML-Format verschicken."
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Signaturdatei:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Benutzername:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr "newsfenster1"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr "Platzhalter"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "Sekunden."
 
@@ -7347,182 +8939,193 @@ msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME-EntschlЭsselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Auf Platte speichern..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "жffnen in %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (Эber %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "Link in Browser Жffnen"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr "%d neu"
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr "%d verborgen"
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "GelЖscht"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr "%d nicht verschickt"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "E-Mail-Adresse:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "Kein GPG/PGP-Programm konfiguriert."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "VerschlЭsselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "VerschlЭsselte Nachricht"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Zum EntschlЭsseln Icon klicken."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 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:1388
+#: mail/mail-format.c:1403
 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:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, 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:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr "UngЭltiger external-body-Teil."
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Ordner %s gibt es nicht"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "жffnen von '%s'..."
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7531,17 +9134,17 @@ msgstr ""
 "Metainformationen zu Ordner kЖnnen nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr Жffnen kЖnnen: %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr "Datei %s konnte nicht geladen werden"
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr "Sie kЖnnen das Format eines nichtlokalen Ordners nicht Дndern."
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr "%s neu konfigurieren"
@@ -7564,104 +9167,129 @@ msgstr ""
 "Fehler beim AusfЭhren eines Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Dieses Passwort speichern"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "In Arbeit"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Ordner wird aktualisiert"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "ERhalten von Mail"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Machrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "MЭll"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s Жffnen"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "жffnen des Speichers %s"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Ordner %s Жffnen"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Ordner wird synchronisiert"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Ordner wird aktualisiert"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Ordner wird gesДubert"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s abrufen"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d Nachricht(en) werden/wird abgerufen"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d Nachricht(en) werden/wird gespeichert"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7670,7 +9298,7 @@ msgstr ""
 "Ausgabedatei konnte nicht erstellt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7679,11 +9307,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7692,77 +9320,73 @@ msgstr ""
 "Ausgabedatei kann nicht erstellt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Suchen"
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(Unbenannte Nachricht)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 msgid "Untitled Message"
 msgstr "Unbenannte Nachricht"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 msgid "Empty Message"
 msgstr "Leere Nachricht"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "In Nachricht suchen"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "Groъ-/Kleinschreibung beachten"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr "VorwДrts suchen"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Suchen:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Passt auf:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Mail erhalten & verschicken"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Erhalten"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "Verschicken"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Storniert"
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
@@ -7781,81 +9405,88 @@ msgstr "Weitergeleitete Nachricht - %s"
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Nach Betreff"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "Meldung"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "HЖher"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "Am hЖchsten"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%d. %b %H.%M"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2290
-msgid "Updating message list"
+#: mail/message-list.c:2312
+#, fuzzy
+msgid "Generating message list"
 msgstr "Aktualisieren der Nachrichtenliste"
 
 #: mail/message-list.etspec.h:2
@@ -7870,38 +9501,77 @@ msgstr "Erhalten"
 msgid "Size"
 msgstr "GrЖъe"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Ordner"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "Speicher"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Ordner anzeigen, die beginnen mit:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Erhalte Speicher fЭr \"%s\""
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Ordner \"%s\" wird abonniert"
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Ordner"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "Dieses Ereignis wurde gelЖscht."
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Liste aktualisieren"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Alle Ordner:"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Sender anzeigen:"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "Abonnements verwalten"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Abonnieren"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Abonnement kЭndigen"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Evolution-Komponente fЭr die Chefsesselansicht"
@@ -7910,50 +9580,68 @@ msgstr "Evolution-Komponente fЭr die Chefsesselansicht"
 msgid "Factory for the Evolution executive summary component."
 msgstr "Factory fЭr Evolutions Chefsesselansichts-Komponente."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 "Evolutions Chefsesselansichts-Komponente kann nicht initialisiert werden."
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Termine"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 msgid "No appointments"
 msgstr "Keine Termine"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 msgid "%l:%M%p"
 msgstr "%H.%M"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 msgid "%a %l:%M%p"
 msgstr "%a %H.%M"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr "Einen Newsstrom hinzufЭgen"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 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:1408
-msgid "My Evolution Settings"
-msgstr "Einstellungen von My Evolution"
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Name:"
+
+#: my-evolution/e-summary-preferences.c:1421
+#, fuzzy
+msgid "Summary Settings"
+msgstr "_Aufgaben-Einstellungen..."
 
 #: my-evolution/e-summary-rdf.c:281
 #, fuzzy
@@ -7964,7 +9652,12 @@ msgstr "Beim Herunterladen des Newsstromes ist ein Fehler aufgetreten</b></dt>"
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fehler beim Herunterladen von RDF</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "NewsstrЖme"
+
+#: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr "Keine Aufgaben"
 
@@ -7972,32 +9665,71 @@ msgstr "Keine Aufgaben"
 msgid "My Weather"
 msgstr "Mein Wetter"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 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:512
+msgid "Weather"
+msgstr "Wetter"
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Regionen"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
-msgstr "%A, %d. %B %Y"
+#, fuzzy
+msgid "%A, %B %e %Y"
+msgstr "%a, %d. %B %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
-msgstr "My Evolution Drucken"
+#, fuzzy
+msgid "Print Summary"
+msgstr "Zusammenfassung"
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
-msgstr "Drucken von My Evolution fehlgeschlagen"
+#, fuzzy
+msgid "Printing of Summary failed"
+msgstr "Drucken der Nachricht fehlgeschlagen"
 
 #: my-evolution/main.c:52
 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"
@@ -9149,107 +10881,143 @@ msgid "Drifting dust whirls"
 msgstr "Abtreibende Staubteufel"
 
 #: my-evolution/my-evolution.glade.h:1
-msgid "Add new feed"
-msgstr "Neuen Strom hinzufЭgen"
+#, fuzzy
+msgid " _Remove"
+msgstr "_Entfernen"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "All folders:"
-msgstr "Alle Ordner:"
+#, fuzzy
+msgid "Add n_ew feed"
+msgstr "Neuen Strom hinzufЭgen"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr "Alle NewsstrЖme:"
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Alle Sender:"
 
 #: my-evolution/my-evolution.glade.h:4
-msgid "All stations:"
-msgstr "Alle Sender:"
+#, fuzzy
+msgid "All _folders:"
+msgstr "Alle Ordner:"
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "Display folders:"
-msgstr "Ordner anzeigen:"
+#: my-evolution/my-evolution.glade.h:5
+#, fuzzy
+msgid "All news _feeds:"
+msgstr "Alle NewsstrЖme:"
 
 #: my-evolution/my-evolution.glade.h:7
-msgid "Display stations:"
-msgstr "Sender anzeigen:"
+msgid "How many days should the calendar display at once?"
+msgstr "Wie viele Tage soll der Kalender auf einmal anzeigen?"
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "Displayed feeds:"
-msgstr "angezeigte StrЖme:"
+#, fuzzy
+msgid "Ma_x number of items shown:"
+msgstr "Maximale Anzahl angezeigter EintrДge:"
 
 #: my-evolution/my-evolution.glade.h:9
-msgid "Five days"
-msgstr "FЭnf Tage"
+msgid "News Feed Settings"
+msgstr "Newsstrom-Einstellungen"
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr "Wie viele Tage soll der Kalender auf einmal anzeigen?"
+#, fuzzy
+msgid "One mont_h"
+msgstr "Ein Monat"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "Eine Woche"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
-msgstr "Maximale Anzahl angezeigter EintrДge:"
+#, fuzzy
+msgid "Refresh _time (seconds):"
+msgstr "Aktualisierungszeit (Sekunden):"
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr "Newsstrom-Einstellungen"
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Alle Aufgaben anzeigen"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr "NewsstrЖme"
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "Heutige Aufgaben anzeigen"
 
 #: my-evolution/my-evolution.glade.h:15
-msgid "One day"
-msgstr "Ein Tag"
+msgid "Tasks "
+msgstr "Aufgaben "
 
 #: my-evolution/my-evolution.glade.h:16
-msgid "One month"
-msgstr "Ein Monat"
+msgid "Units: "
+msgstr "Einheiten: "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "One week"
-msgstr "Eine Woche"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
-msgstr "Aktualisierungszeit (Sekunden):"
+msgid "Weather settings"
+msgstr "Wetter-Einstellungen"
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Schedule"
-msgstr "Ansetzen"
+#, fuzzy
+msgid "_Display folders:"
+msgstr "Ordner anzeigen:"
 
 #: my-evolution/my-evolution.glade.h:20
-msgid "Show all tasks"
-msgstr "Alle Aufgaben anzeigen"
+#, fuzzy
+msgid "_Display stations:"
+msgstr "Sender anzeigen:"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
-msgstr "Vollen Pfad fЭr Ordner anzeigen"
+#, fuzzy
+msgid "_Displayed feeds:"
+msgstr "angezeigte StrЖme:"
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "Show today's tasks"
-msgstr "Heutige Aufgaben anzeigen"
+#, fuzzy
+msgid "_Five days"
+msgstr "FЭnf Tage"
 
 #: my-evolution/my-evolution.glade.h:23
-msgid "Tasks "
-msgstr "Aufgaben "
+#, fuzzy
+msgid "_Mail"
+msgstr "Mail"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
-msgstr "Einheiten: "
+#, fuzzy
+msgid "_News Feeds"
+msgstr "NewsstrЖme"
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "Weather"
-msgstr "Wetter"
+#, fuzzy
+msgid "_One day"
+msgstr "Ein Tag"
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "Weather settings"
-msgstr "Wetter-Einstellungen"
+#, fuzzy
+msgid "_Refresh time (seconds):"
+msgstr "Aktualisierungszeit (Sekunden):"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "imperial"
-msgstr "englisch"
+#, fuzzy
+msgid "_Schedule"
+msgstr "Ansetzen"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "Vollen Pfad fЭr Ordner anzeigen"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Wetter"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "englisch"
+
+#: my-evolution/my-evolution.glade.h:31
+#, fuzzy
+msgid "m_etric"
 msgstr "metrisch"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9264,7 +11032,16 @@ msgstr "Details anzeigen"
 msgid "Cancel Operation"
 msgstr "Aktion abbrechen"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
@@ -9321,7 +11098,7 @@ msgstr ""
 "Ein Fehler trat auf beim Kopieren von Dateien nach\n"
 "'%s'."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9332,7 +11109,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9347,7 +11124,7 @@ msgstr ""
 "MЖchten Sie, dass dieses Verzeichnis\n"
 "entfernt wird?"
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9359,52 +11136,74 @@ msgstr ""
 "es, damit Evolution seine Benutzerdateien\n"
 "installieren kann."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 msgid "Cannot move a folder over itself."
 msgstr "Ordner kann nicht in sich selbst verschoben werden."
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot copy a folder over itself."
 msgstr "Ordner kann nicht in sich selbst kopiert werden."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Ein Ordner kann nicht in eines seiner Kinder verschoben werden."
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Geben Sie einen Ordner an, in den Ordner \"%s\" kopiert werden soll:"
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Ordner kopieren"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 "Geben Sie einen Ordner an, in den Ordner \"%s\" verschoben werden soll:"
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Ordner `%s' konnte nicht gelЖscht werden:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Ordner '%s' lЖschen"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Sind Sie sicher, dass Sie den Ordner '%s' entfernen wollen?"
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Ordner '%s' umbenennen"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+msgid "Rename"
+msgstr "Umbenennen"
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Ordnername:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9418,7 +11217,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "Der angegebene Ordnername ist nicht gЭltig"
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Neuen Ordner anlegen"
 
@@ -9430,11 +11229,11 @@ msgstr ""
 "Der Typ des ausgewДhlten Ordners ist fЭr die \n"
 "gewДhlte Operation nicht gЭltig."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Neu..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
@@ -9474,7 +11273,7 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9524,7 +11323,7 @@ msgstr "Automatisch"
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Eine Datei wДhlen"
 
@@ -9532,31 +11331,53 @@ msgstr "Eine Datei wДhlen"
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Ordner wДhlen"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr "Geben Sie einen Zielordner fЭr das Importieren dieser Daten an"
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9566,89 +11387,106 @@ msgstr ""
 "fЭr Mail sowie Termin- und Kontaktverwaltung\n"
 "in der GNOME-Desktopumgebung."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr "WДhlen Sie den Ordner, den Sie Жffnen wollen"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
 msgstr "Eine neue VerknЭpfung anlegen"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "WДhlen Sie den Ordner, auf den die VerknЭpfung zeigen soll:"
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr "Online arbeiten"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#. 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution ist zur Zeit online. Klicken Sie diesen Knopf, um offline zu "
 "arbeiten."
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution geht gerade offline."
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution ist gerade offline. Klicken Sie auf diesen Knopf, um online zu "
 "arbeiten."
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Hoppla! Die Ansicht fЭr `%s' ist unerwartet gestorben.  :-(\n"
 "Das heiъt wahrscheinlich, dass die %s-Komponente abgestЭrzt ist."
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "UngЭltiger Inhalt der Nachricht"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "Speicher kann nicht bei der Shell registriert werden"
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Allgemeiner Fehler"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Neue VerknЭpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Gruppenname:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9657,169 +11495,160 @@ msgstr ""
 "Wollen Sie wirklich Gruppe `%s' aus\n"
 "der VerknЭpfungsleiste entfernen?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Nicht entfernen"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
 msgstr "VerknЭpfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 msgid "Rename selected shortcut group to:"
 msgstr "AusgewДhlte VerknЭpfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "Kleine Icons"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Die VerknЭpfungen als kleine Icons anzeigen"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "Groъe Icons"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Die VerknЭpfungen als groъe Icons zeigen"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "Neue Gruppe..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Eine neue VerknЭpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 msgid "_Remove this Group..."
 msgstr "Diese Gruppe _entfernen..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Diese VerknЭpfungsgruppe entfernen"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 msgid "Re_name this Group..."
 msgstr "Diese Gruppe _umbenennen..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
 msgstr "Diese VerknЭpfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "Die VerknЭpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Die VerknЭpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
 msgstr "VerknЭpfung umbenennen"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 msgid "Rename selected shortcut to:"
 msgstr "AusgewДhlte VerknЭpfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "жffnen"
-
-#: shell/e-shortcuts-view.c:474
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr "Den mit dieser VerknЭpfung verbundenen Ordner Жffnen"
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "In neuem Fenster Жffnen"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 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:479
-msgid "Rename"
-msgstr "Umbenennen"
-
-#: shell/e-shortcuts-view.c:479
+#: shell/e-shortcuts-view.c:383
 msgid "Rename this shortcut"
 msgstr "Diese VerknЭpfung umbenennen"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese VerknЭpfung aus der VerknЭpfungsleiste entfernen"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von VerknЭpfungen."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr "VerknЭpfungen"
 
-#: shell/e-shortcuts.c:984
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-shortcuts.c:987
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Kein Name)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Allgemeiner Fehler"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ungЭltig"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Nicht genЭgend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Funktion fЭr diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Operation nicht unterstЭtzt"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird fЭr diese Speicherweise nicht unterstЭtzt"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Der angegebene Ordner wurde nicht gefunden"
+
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Ein Ordner kann nicht in eines seiner Kinder verschoben werden."
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
@@ -9840,10 +11669,6 @@ msgstr "Rechner"
 msgid "The following connections are currently active:"
 msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Ordnername:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Ordnertyp:"
@@ -9859,17 +11684,29 @@ msgstr ""
 "beginnen."
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Evolution-Importwerkzeug"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Evolution-Importeur-Werkzeug"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Eine Datei wДhlen"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "Willkommen zum Evolution-Importwerkzeug.\n"
@@ -9889,10 +11726,11 @@ msgid "Don't ask me again"
 msgstr "Mich nicht mehr fragen"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+#, fuzzy
+msgid "Evolution can import data from the following files:"
 msgstr "Evolution hat die folgenden Datenquellen gefunden:"
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9921,7 +11759,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
 "werden, und wir hoffen auf Ihre Mitarbeit!\n"
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9929,24 +11767,29 @@ msgstr ""
 "Danke.\n"
 "das Evolution-Team\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 msgid "Cannot access the Evolution shell."
 msgstr "Auf Evolution-Shell kann nicht zugegriffen werden."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Auf Evolution-Shell kann nicht zugegriffen werden."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "Splashscreen deaktivieren"
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Das Bonobo-Komponentensystem kann nicht initialisiert werden."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopieren"
 
@@ -9962,11 +11805,11 @@ 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
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
@@ -9974,73 +11817,118 @@ msgstr "Die Auswahl ausschneiden"
 msgid "Delete selected contacts"
 msgstr "AusgewДhlte Kontakte lЖschen"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Neuer Kontakt"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "New List"
 msgstr "Neue Liste"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "EinfЭgen"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einfЭgen"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Kontakte"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "AusgewДhlte Kontakte drucken"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "AusgewДhlte Kontakte lЖschen"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Alle auswДhlen"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Alle Kontakte auswДhlen"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "_Nachricht an Kontakt schicken..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "AusgewДhlte Kontakte lЖschen"
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Nachricht an Kontakt schicken"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "Kontakt an anderen schicken"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Laden abbrechen"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "Aktio_nen"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "_Adressbuch-Quellen..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:24
-msgid "_Contact Group"
-msgstr "_Kontaktgruppe"
+#: ui/evolution-addressbook.xml.h:32
+#, fuzzy
+msgid "_Contact List"
+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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "Kontakte..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Als VCard speichern"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "Nach Kontakten _suchen"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "Alle auswДhlen"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "Werkzeuge"
 
@@ -10049,108 +11937,131 @@ msgid "Configure the calendar's settings"
 msgstr "Einstellungen des Kalenders konfigurieren"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All-Day _Event"
+#, fuzzy
+msgid "Create a New All Day _Event"
 msgstr "Ein neues ganztДgiges _Ereignis anlegen"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a _New Appointment"
-msgstr "Einen _neuen Termin anlegen"
+#, fuzzy
+msgid "Create a New _Task"
+msgstr "Eine neue Aufgabe anlegen"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Einen neuen Termin anlegen"
+msgid "Create a _New Appointment"
+msgstr "Einen _neuen Termin anlegen"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "Ein ganztДgiges Ereignis anlegen"
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Day"
+msgstr "_Tag"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Diesen Termin lЖschen"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Gehe zu"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "In der Zeit zurЭckgehen"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "In der Zeit vorangehen"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Gehe zu _Datum"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Zur aktuellen Zeit gehen"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Zum heutigen Tag"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "_Monat"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Neue Aufgabe"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Zeigt eine Vorschau des zu druckenden Kalenders"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Kalender drucken"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Druckvorschau"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
-msgstr "VerfЭgbarkeitsinformationen verЖffentlichen"
-
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr "VerfЭgbarkeitsinformationen fЭr diesen Kalender verЖffentlichen"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Einen Tag zeigen"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "1 Monat zeigen"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "1 Woche zeigen"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Die Werkwoche zeigen"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "_Werkwoche"
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "Week"
+msgstr "_Woche"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "_Termin..."
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "_Kalender-Einstellungen..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "_Tag"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "_Monat"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "VerfЭgbarkeitsinformationen verЖffentlichen"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "_Woche"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "Aufgabe"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10161,15 +12072,16 @@ msgid "Close"
 msgstr "Schlieъen"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Diesen Termin abschlieъen"
+#, fuzzy
+msgid "Close this item"
+msgstr "Diesen Eintrag lЖschen"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Diesen Termin lЖschen"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Diesen Eintrag lЖschen"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Hauptwerkzeugleiste"
 
@@ -10177,111 +12089,81 @@ msgstr "Hauptwerkzeugleiste"
 msgid "Preview the printed item"
 msgstr "Eine Vorschau des zu druckenden Objektes zeigen"
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
-msgid "Print Pre_view"
-msgstr "Druckvorschau"
-
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print S_etup"
-msgstr "Druck_einstellungen"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Drucken..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Speichern"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Speichern und schlieъen"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
-msgstr "Den Termin speichern und das Dialogfenster schlieъen"
+#: ui/evolution-comp-editor.xml.h:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Die Liste speichern und das Dialogfenster schlieъen"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Diesen Eintrag auf Platte speichern"
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Die Seiteneinstellungen fЭr Ihren aktuellen Drucker einrichten"
-
-#: ui/evolution-comp-editor.xml.h:19
-msgid "_Action"
-msgstr "_Aktion"
-
-#: 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Datei"
 
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Diesen Eintrag lЖschen"
-
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete..."
-msgstr "LЖschen..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Hilfe"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Umschlag drucken..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Speichern _unter..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Den Kontakt speichern und das Dialogfenster schlieъen"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Kontakt an anderen schicken..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Online-Hilfe einsehen"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "_Nachricht an Kontakt schicken..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Diese Liste lЖschen"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "LЖschen..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Die Liste speichern und das Dialogfenster schlieъen"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Liste an andere schicken..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "_Nachricht an Liste schicken..."
 
@@ -10289,19 +12171,19 @@ msgstr "_Nachricht an Liste schicken..."
 msgid "Cancel Mee_ting"
 msgstr "Besprechung _absagen"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "Die Besprechung fЭr diesen Eintrag stornieren"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Diesen Eintrag per E-Mail weiterleiten"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr "Die letzten Besprechungsinformationen erhalten"
 
@@ -10313,15 +12195,10 @@ msgstr "Besprechung _aktualisieren"
 msgid "Schedule _Meeting"
 msgstr "Besprechung ansetzen"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Eine Besprechung fЭr diesen Eintrag ansetzen"
 
-#: 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 "Aktio_nen"
-
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customise My Evolution"
 msgstr "My Evolution anpassen"
@@ -10335,67 +12212,64 @@ msgid "Cancel the current mail operation"
 msgstr "Den aktuellen Mailvorgang abbrechen"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Erstellen"
-
-#: ui/evolution-mail-global.xml.h:4
 msgid "Compose _New Message"
 msgstr "_Neue Nachricht erstellen"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr "Mailaccounts anlegen und bearbeiten sowie andere Vorlieben"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Regeln zum Filtern neuer Mail anlegen oder bearbeiten"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "Definitionen virtueller Ordner anlegen oder bearbeiten"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "_MЭll leeren"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "PasswЖrter vergessen"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Erinnerte PasswЖrter vergessen, so dass Sie wieder nach ihnen gefragt werden"
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "_Abonnements verwalten..."
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Meldung"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Erstellen einer Mailnachricht Жffnen"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Alle gelЖschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Verschicken / Empfangen"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Mail in der Warteschlange verschicken und neue Mail abholen"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr "Nachrichten-Vorschaufenster zeigen"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf entfernten Servern abonnieren oder abbestellen"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor fЭr virtuelle Ordner..."
 
@@ -10419,91 +12293,102 @@ msgstr "_VorschauflДche"
 msgid "_Send / Receive"
 msgstr "_Verschicken / Empfangen"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "Ordner \"%s\" wird abonniert"
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners Дndern"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "AusgewДhlte Nachrichten kopieren"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Ausschneiden"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "AusgewДhlte Nachrichten ausschneiden"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "_AusgewДhlte Nachrichten verbergen"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "_GelЖschte Nachrichten verbergen"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Ge_lesene Nachrichten verbergen"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Verborgene Nachrichten verbergen, statt sie durchgestrichen darzustellen"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Alle als gelesen markieren"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Alle sichtbaren Nachrichten als gelesen markieren"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Nachricht in der Zwischenablage einfЭgen"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Alle gelЖschten Nachrichten auf Dauer aus diesem Ordner entfernen"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Alle auswДhlen"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "_Strang auswДhlen"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 "Alle momentan nicht ausgewДhlten Nachrichten und keine anderen auswДhlen"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Alle Nachrichten im selben Strang wie die ausgewДhlte Nachricht auswДhlen"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wДhlen"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "_Alle anzeigen"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "Ge_lesene Nachrichten verbergen"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Nachrichten zeigen, die zeitweilig verborgen wurden"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Alle bereits gelesenen Nachrichten zeitweilig verbergen"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Die gewДhlten Nachrichten zeitweilig verbergen"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in StrДnge geordnet"
 
@@ -10511,7 +12396,7 @@ msgstr "Nachrichtenliste in StrДnge geordnet"
 msgid "_Expunge"
 msgstr "_SДubern"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Ordner"
 
@@ -10519,11 +12404,11 @@ msgstr "_Ordner"
 msgid "_Invert Selection"
 msgstr "Auswahl _umkehren"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "Eigenschaften..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
 msgstr "Nachrichtenliste in _Strangordnung"
 
@@ -10741,7 +12626,8 @@ msgstr ""
 "Die gewДhlte Nachrichten im Maileditor Жffnen, um sie nochmals zu verschicken"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10763,38 +12649,34 @@ msgstr "Nachricht drucken"
 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:65
-msgid "Print Preview..."
-msgstr "Druckvorschau..."
-
-#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Antworten"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "Nachricht durch_suchen"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 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:73
+msgid "Setup the page settings for your current printer"
+msgstr "Die Seiteneinstellungen fЭr Ihren aktuellen Drucker einrichten"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quellcode zeigen"
@@ -10835,67 +12717,51 @@ msgstr "VOrdner Эber _EmpfДnger..."
 msgid "VFolder on _Subject..."
 msgstr "VOrdner Эber _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "Filter _anwenden"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr "_Normale Anzeige"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "Nachricht _Жffnen"
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Re-send Message"
-msgstr "Nachricht _nochmals verschicken"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Dieses Fenster schlieъen"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
-msgid "Customi_ze Toolbars..."
-msgstr "Werkzeugleisten anpassen..."
-
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
-msgid "Customize"
-msgstr "Anpassen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
-msgid "Customize toolbars"
-msgstr "Werkzeugleisten anpassen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "Schlieъen"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Ansicht"
 
@@ -10960,11 +12826,6 @@ msgstr "Mit S/MIME verschlЭsseln"
 msgid "S/MIME Sign"
 msgstr "Mit S/MIME signieren"
 
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
-msgid "Save"
-msgstr "Speichern"
-
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Speichern _unter"
@@ -11092,7 +12953,7 @@ msgstr "Antwort-an-Feld"
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -11125,14 +12986,29 @@ msgid "Unsubscribe"
 msgstr "Abonnement kЭndigen"
 
 #: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Assign Task"
+msgstr "Zugewiesen"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Aufgabe stornieren"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
-msgstr "Aufgabe delegieren"
+#: ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Cancel this task"
+msgstr "Aufgabe stornieren"
 
 #: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Obtain the latest task information"
+msgstr "Die letzten Besprechungsinformationen erhalten"
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "Aufgabe _aktualisieren"
 
@@ -11141,40 +13017,28 @@ msgstr "Aufgabe _aktualisieren"
 msgid "Configure the task view's settings"
 msgstr "Einstellungen des Kalenders konfigurieren"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "AusgewДhlte Aufgabe kopieren"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Eine neue Aufgabe anlegen"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "AusgewДhlte Aufgabe ausschneiden"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 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:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Aufgabe aus der Zwischenablage einfЭgen"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr "Aufgabe als etwas anderes speichern"
-
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "_Aufgaben-Einstellungen..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "Aufgabe"
 
@@ -11206,173 +13070,155 @@ msgstr "Eine VerknЭpfung mit diesem Ordner in der VerknЭpfungsleiste anlegen"
 msgid "Create a new folder"
 msgstr "Einen neuen Ordner anlegen"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
 msgstr "Diesen Ordner lЖschen"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Einen anderen Ordner anzeigen"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "Beenden"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr "Evolution-_FAQ"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "Evolution-_Fenster"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Das Programm verlassen"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "Erste Schritte"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Ein externes Dateiformat importieren"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "Diesen Ordner an einen anderen Ort verschieben"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "In neuem _Fenster Жffnen"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Diesen Ordner in einem anderen Fenster Жffnen"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Information Эber Evolution anzeigen"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit dem Fehlermelder (Bug Buddy) einschicken"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "Ein/Aus"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Anzeige der Ordnerleiste an/aus"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Anzeige der VerknЭpfungsleiste an/aus"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "Offline-Arbeitsmodus an/aus."
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr "Die Kontaktverwaltung benutzen"
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr "Den Kalender benutzen"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "Den _Mailer benutzen"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Den gewДhlten Ordner betrachten"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "эber Evolution..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "Termin (FIXME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "Kontakt (FIXME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Kopieren..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "Ordnerleiste"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "Datei _importieren..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "_Index"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "_Mailnachricht"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_Verschieben..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "Neuer Ordner"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_VerknЭpfung"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "VerknЭpfungsleiste"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "Aufgabe (FIXME)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "Offline _arbeiten"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+#, fuzzy
+msgid "Change the settings for the summary"
 msgstr "Die Eigenschaften von My Evolution Дndern"
 
 #: ui/my-evolution.xml.h:4
-msgid "_My Evolution Settings..."
-msgstr "Einstellungen von _My Evolution..."
+#, fuzzy
+msgid "Print summary"
+msgstr "Mail-Zusammenfassung"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Gelesen"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "_Mail-Einstellungen..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -11406,6 +13252,28 @@ msgstr "Nachrichten"
 msgid "With Category"
 msgstr "Mit Kategorie"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Eine Zeitzone wДhlen"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Auswahl:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Zeitzonen"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"Benutzen Sie die linke Maustaste, um an einen Bereich der Karte "
+"heranzuzoomen, und wДhlen Sie eine Zeitzone.\n"
+" Mit der rechten Maustaste kЖnnen Sie wegzoomen."
+
 #. 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
@@ -11413,10 +13281,6 @@ msgstr "Mit Kategorie"
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "BeschДftigt"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Auъer Haus"
@@ -11489,7 +13353,7 @@ msgstr "Alle Anwesenden"
 msgid "_Current View"
 msgstr "Aktuelle Ansicht"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
@@ -11499,19 +13363,20 @@ msgstr "Ansichten definieren"
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Jetzt"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Heute"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
@@ -11593,34 +13458,32 @@ msgstr "Zeichenkodierung"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 msgid "Search Editor"
 msgstr "Editor fЭr Suchen"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Suche speichren"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "Komplexe Suche"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Suche speichren"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Kalender"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Alle zeigen"
 
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Komplex..."
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Information"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Warnung"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Fehler"
@@ -11638,10 +13501,15 @@ msgstr "Meldung"
 msgid "Don't show this message again."
 msgstr "Diese Meldung nicht mehr anzeigen."
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Su_chen"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "DN binden:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Der persЖnliche Adressbuchserver"
@@ -11662,21 +13530,329 @@ msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Zusammenfassung"
+
+#~ msgid "LDAP Server"
+#~ msgstr "LDAP-Server"
+
+#~ msgid "File"
+#~ msgstr "Datei"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Unbekannter Adressbuch-Typ"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Kein (Anonymer Modus)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Unbekannter Legitimationstyp"
+
+#~ msgid "Subtree"
+#~ msgstr "Unterbaum"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Unbekannter Bereichstyp"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "FIXME DN-Bindungs-Hilfetext hier"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "FIXME Host-Rechner-Hilfetext hier."
+
+#~ msgid "Root DN:"
+#~ msgstr "Root-DN:"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "FIXME Root-DN-Hilfetext hier."
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "FIXME Port-Hilfetext hier."
+
+#~ msgid "Authentication:"
+#~ msgstr "Legitimation:"
+
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "Komplexe LDAP-Optionen"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "FIXME Pfad-Hilfetext hier"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Pfad erstellen wenn er noch nicht existiert."
+
+#~ msgid ""
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
+#~ msgstr ""
+#~ "WДhlen Sie den Typ ihres Adressbuches und geben Sie die relevanten "
+#~ "Informationen ein."
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "FIXME Hilfetext zum Namen hier"
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "FIXME Hilfetext zur Beschreibung hier"
+
+#~ msgid "Name"
+#~ msgstr "Name"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Bitte geben Sie das Passwort fЭr %s ein"
+
+#~ msgid "Category contains"
+#~ msgstr "Kategorie enthДlt"
+
+#~ msgid "Select name from _folder:"
+#~ msgstr "Name aus _Ordner wДhlen:"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#~ msgid "Canceled"
+#~ msgstr "Abgebrochen"
+
+#~ msgid "Transparent"
+#~ msgstr "Transparent"
+
+#~ msgid "Opaque"
+#~ msgstr "Opak"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "Die Klassifizierung muss 'жffentlich', 'Privat', 'Vertraulich' oder "
+#~ "'Keine' sein"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "Die Transparenz muss 'Transparent', 'Opak' oder 'Keine' sein."
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Piepsen, wenn Alarmfenster erscheinen."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Kalender-Vorlieben"
+
+#~ msgid "Colors for Tasks"
+#~ msgstr "Farben fЭr Aufgaben"
+
+#~ msgid "Date Navigator"
+#~ msgstr "Datumsnavigator"
+
+#~ msgid "Defaults"
+#~ msgstr "Voreinstellungen"
+
+#~ msgid "Notification Options"
+#~ msgstr "Benachrichtigungsoptionen"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Mich an alle Termine erinnern,"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "Minuten bevor sie auftreten."
+
+#~ msgid "Delegated From:"
+#~ msgstr "Delegiert durch:"
+
+#~ msgid "No one"
+#~ msgstr "Niemanden"
+
+#~ msgid "Task"
+#~ msgstr "Aufgabe"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% abgeschlossen:"
+
+#~ msgid "Transparency"
+#~ msgstr "Transparenz"
+
+#~ 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."
+
+#~ msgid "This is a meeting request."
+#~ msgstr "Dies ist eine Besprechungsanfrage."
+
+#~ msgid "This is one or more additions to a current meeting."
+#~ msgstr ""
+#~ "Dies sind ein oder mehrere NachtrДge zu einer aktuellen Besprechung."
+
+#~ msgid "This is a request for the latest event information."
+#~ msgstr "Dies ist eine Anfrage zu den neuesten Ereignisinformationen."
+
+#~ msgid "This is an event cancellation."
+#~ msgstr "Dies ist eine Ereignisstornierung."
+
+#~ msgid "The message is not understandable."
+#~ msgstr "Diese Nachricht ist unverstДndlich."
+
+#~ 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."
+
+#~ msgid "This is a task request."
+#~ msgstr "Dies ist eine Aufgabenanfrage."
+
+#~ msgid "This is a reply to a task request."
+#~ msgstr "Dies ist eine Antwort auf eine Aufgabenanfrage."
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Diese Nachricht schein formell ungЭltig zu sein"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Die Nachricht enthДlt keine unterstЭtzten Anfragen."
+
+#~ msgid "The information contained in this attachment was not valid"
+#~ msgstr "Die in diesem Anhang enthaltene Information war ungЭltig."
+
+#~ msgid "All"
+#~ msgstr "Alle"
+
+#~ msgid "Edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Suche als VOrdner speichern"
+
+#~ msgid "Resend"
+#~ msgstr "Nochmals schicken"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Evolution-Accountverwaltung"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "Am %s schrieb %s:"
+
+#~ msgid "Receiving"
+#~ msgstr "Erhalten"
+
+#~ msgid "Store"
+#~ msgstr "Speicher"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Ordner anzeigen, die beginnen mit:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "Erhalte Speicher fЭr \"%s\""
+
+#~ msgid "My Evolution Settings"
+#~ msgstr "Einstellungen von My Evolution"
+
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %d. %B %Y"
+
+#~ msgid "Print My Evolution"
+#~ msgstr "My Evolution Drucken"
+
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Drucken von My Evolution fehlgeschlagen"
+
+#~ msgid "My Evolution"
+#~ msgstr "My Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Neuer Kontakt"
+
+#~ msgid "_Contact Group"
+#~ msgstr "_Kontaktgruppe"
+
+#~ msgid "Go to present time"
+#~ msgstr "Zur aktuellen Zeit gehen"
+
+#~ msgid "W_ork Week"
+#~ msgstr "_Werkwoche"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Diesen Termin abschlieъen"
+
+#~ msgid "Print S_etup"
+#~ msgstr "Druck_einstellungen"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Den Termin speichern und das Dialogfenster schlieъen"
+
+#~ msgid "_Action"
+#~ msgstr "_Aktion"
+
+#~ msgid "Help"
+#~ msgstr "Hilfe"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Kontakt an anderen schicken..."
+
+#~ msgid "See online help"
+#~ msgstr "Online-Hilfe einsehen"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "_Abonnements verwalten..."
+
+#~ msgid "Show _All"
+#~ msgstr "_Alle anzeigen"
+
+#~ msgid "Print Preview..."
+#~ msgstr "Druckvorschau..."
+
+#~ msgid "_Re-send Message"
+#~ msgstr "Nachricht _nochmals verschicken"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Werkzeugleisten anpassen..."
+
+#~ msgid "Customize"
+#~ msgstr "Anpassen"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Werkzeugleisten anpassen"
+
+#~ msgid "Delegate Task"
+#~ msgstr "Aufgabe delegieren"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Aufgabe als etwas anderes speichern"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Erste Schritte"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Die Kontaktverwaltung benutzen"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Den Kalender benutzen"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Den _Mailer benutzen"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "Termin (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "Kontakt (FIXME)"
+
+#~ msgid "_Index"
+#~ msgstr "_Index"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Mailnachricht"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "Aufgabe (FIXME)"
+
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Einstellungen von _My Evolution..."
+
 #~ 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"
 
@@ -11690,35 +13866,11 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgstr "Weitergeleitete Nachricht (kein Betreff)"
 
 #~ 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 ""
-#~ "-----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"
+#~ "-----Weitergeleitete Nachricht-----<br><b>Von:</b> %s<br><b>An:</b> %"
+#~ "s<br><b>Betreff:</b> %s<br>"
 
 #~ msgid "Wipe trackers"
 #~ msgstr "Verfolgungen auswischen"
diff --git a/po/el.po b/po/el.po
index 44f9fd886b..4d6167fb03 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Spiros Papadimitriou <spapadim+@cs.cmu.edu>, 2000.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -21,197 +22,197 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -227,13 +228,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -253,8 +254,8 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -270,21 +271,21 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -337,212 +338,215 @@ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 msgid "Factory for the sample Addressbook control"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
 #, fuzzy
-msgid "LDAP Server"
-msgstr "мщА оЛэДА"
+msgid "Contacts"
+msgstr "_цМЫЯИЛъА"
 
-#: addressbook/gui/component/addressbook-config.c:150
+#: addressbook/gui/component/addressbook-component.c:68
 #, fuzzy
-msgid "File"
-msgstr "_жэЙЕККОР"
+msgid "Folder containing contact information"
+msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ СТОИВЕъА ГЛЕЯОКОЦъОУ"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
 #, 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 ""
+msgid "New Contact"
+msgstr "_цМЫЯИЛъА"
 
-#: addressbook/gui/component/addressbook-config.c:177
+#: addressbook/gui/component/addressbook-component.c:386
 #, fuzzy
-msgid "Base"
-msgstr "еПИЙЭККГСГ"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr ""
+msgid "New _Contact"
+msgstr "_цМЫЯИЛъА"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-component.c:387
 #, 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 ""
+msgid "New Contact List"
+msgstr "_цМЫЯИЛъА"
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+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:144
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "мщА сУМТЭЛЕУСГ"
 
-#: addressbook/gui/component/addressbook-config.c:411
+#: addressbook/gui/component/addressbook-config.glade.h:5
 #, fuzzy
-msgid "Port:"
-msgstr "пЯОТЕЯАИЭТГТА"
+msgid "Advanced"
+msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#, fuzzy
+msgid "Base"
+msgstr "еПИЙЭККГСГ"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "еПИЙЭККГСГ"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "De_lete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
+#: addressbook/gui/component/addressbook-config.glade.h:10
 #, fuzzy
-msgid "Path:"
-msgstr "еПИЙЭККГСГ"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr ""
+msgid "Search _base:"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: addressbook/gui/component/addressbook-config.c:663
+#: addressbook/gui/component/addressbook-config.glade.h:12
 #, fuzzy
-msgid "Edit Addressbook"
-msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+msgid "Server Name"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/component/addressbook-config.glade.h:13
 #, fuzzy
-msgid "Add Addressbook"
-msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+msgid "Sub"
+msgstr "хщЛА"
 
-#: addressbook/gui/component/addressbook-config.c:683
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:691
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
-msgid "Name:"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid ""
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:694
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "мщА сУМТЭЛЕУСГ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "De_lete"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:21
+#, fuzzy
+msgid "_Account name:"
+msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid "_My server requires authentication"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 #, fuzzy
 msgid "Other Contacts"
 msgstr "кОИПщР сУМТОЛЕЩСЕИР"
 
-#: addressbook/gui/component/addressbook.c:345
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
-msgid "Enter password for %s"
+msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:394
+msgid "LDAP Authentication"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:405
+#, fuzzy
+msgid "Email Address:"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/gui/component/addressbook.c:481
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -550,50 +554,76 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 #, fuzzy
 msgid "Any field contains"
 msgstr "жэЙЕКОР ПОУ ПЕЯИщВЕИ ЕЙЙЯЕЛЭТГТЕР"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 #, fuzzy
 msgid "Email contains"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
+msgid "Category is"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+#, fuzzy
+msgid "Advanced..."
+msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "сГЛЕъЫ_ЛА"
+
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr ""
 
@@ -617,20 +647,20 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "кОИПщР сУМТОЛЕЩСЕИР"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
@@ -652,13 +682,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "дИАЦЯАЖч"
 
@@ -672,40 +699,57 @@ msgstr "дИАЦЯАЖч"
 msgid "Send HTML Mail?"
 msgstr "аПОСТОКч"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "кОИПщР сУМТОЛЕЩСЕИР"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
-msgid "Message Recipients"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+msgid "C_ontaining:"
+msgstr "е_МщЯЦЕИЕР"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
-msgid "Select Names"
-msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+msgid "Co_ntacts:"
+msgstr "_цМЫЯИЛъА"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+msgid "F_ind"
+msgstr "пЯОТЕЯАИЭТГТА"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
+msgid "Select Names"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
 msgid "_Category:"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
-msgid "_Search"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "_Folder:"
+msgstr "_жэЙЕККОР"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -720,8 +764,8 @@ 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -731,16 +775,16 @@ msgid "Contact Editor"
 msgstr "_цМЫЯИЛъА"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
-msgstr ""
+#, fuzzy
+msgid "File A_s:"
+msgstr "_жэЙЕККОР"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr ""
 
@@ -765,256 +809,1236 @@ msgstr ""
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "_Contacts..."
 msgstr "_цМЫЯИЛъА"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Home"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Job title:"
 msgstr "_лчМУЛА"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "_Mobile"
 msgstr "_лчМУЛА"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr ""
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Web page address:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 #, fuzzy
 msgid "Company"
 msgstr "аМТИЦЯАЖч"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 #, fuzzy
 msgid "Home"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 #, fuzzy
 msgid "Home 2"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 #, fuzzy
 msgid "Home Fax"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 #, fuzzy
 msgid "Mobile"
 msgstr "_лчМУЛА"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 #, fuzzy
 msgid "Pager"
 msgstr "еПИЙЭККГСГ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 #, fuzzy
 msgid "Primary"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 #, fuzzy
 msgid "Edit Full"
 msgstr "_жэЙЕККОР"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 #, fuzzy
 msgid "Full Name"
 msgstr "лЕТОМОЛАСъА оЛэДАР"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 #, fuzzy
 msgid "E-mail"
 msgstr "_лчМУЛА"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Afghanistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "Antarctica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "Argentina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+msgid "Austria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "лщЦЕХОР"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "аПОСТОКч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "_лчМУЛА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 #, fuzzy
 msgid "Canada"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "_жэЙЕККОР"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+msgid "China"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "аМТИЦЯАЖч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+msgid "France"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+msgid "Greece"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+msgid "Greenland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+msgid "Guam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+msgid "Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "_лчМУЛА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+msgid "Honduras"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "аПОСТОКч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+#, fuzzy
+msgid "Italy"
+msgstr "счЛЕЯА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+msgid "Laos"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+msgid "Lesotho"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+msgid "Macau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "_лчМУЛА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "_лчМУЛА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "_лчМУЛА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+msgid "Mauritius"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "счЛЕЯА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "счЛЕЯА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "_лчМУЛА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "_лчМУЛА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "_цМЫЯИЛъА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "_лчМУЛА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+msgid "Niue"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "_мщО"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "аПОСТОКч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "е_МщЯЦЕИЕР"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "аПОСТОКч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "_жэЙЕККОР"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "аПЭ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "аПОСТОКч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "аПОСТОКч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+msgid "Suriname"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "аПОСТОКч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "аПОСТОКч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+msgid "Taiwan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "йАТэКОЦОР ЕЙЙЯЕЛОТчТЫМ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+msgid "Thailand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "пЯОР"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "счЛЕЯА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "счЛЕЯА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "аПОСТОКч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 #, fuzzy
 msgid "_City:"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr ""
 
@@ -1106,6 +2130,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "дИАЦЯАЖч"
@@ -1116,7 +2141,7 @@ msgid "contact-list-editor"
 msgstr "_цМЫЯИЛъА"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "_цМЫЯИЛъА"
@@ -1126,7 +2151,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1148,25 +2173,32 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "кОИПщР сУМТОЛЕЩСЕИР"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "кОИПщР сУМТОЛЕЩСЕИР"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
+#: widgets/misc/e-filter-bar.c:243
+#, fuzzy
+msgid "Advanced Search"
+msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr ""
 
@@ -1281,45 +2313,55 @@ msgstr ""
 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: 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:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "╤МОИ_ЦЛА"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Send message to contact"
+msgid "Forward Contact"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, fuzzy
 msgid "Print Envelope"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr ""
 
@@ -1336,7 +2378,8 @@ msgid "Success"
 msgstr "мщА сУМТЭЛЕУСГ"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr ""
 
@@ -1344,7 +2387,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr ""
 
@@ -1362,9 +2405,12 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
-msgstr "гЛЕЯОКЭЦИО"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
+msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #, fuzzy
@@ -1392,149 +2438,149 @@ msgid "Error removing list"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 #, fuzzy
 msgid "File As"
 msgstr "_жэЙЕККОР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 #, fuzzy
 msgid "Email"
 msgstr "_лчМУЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 #, fuzzy
 msgid "Primary Phone"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "аМТИЦЯАЖч"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 #, fuzzy
 msgid "Home Phone"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 #, fuzzy
 msgid "Home Address"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "_лчМУЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Other Phone"
 msgstr "кОИПщР сУМТОЛЕЩСЕИР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Other Address"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 #, fuzzy
 msgid "Department"
 msgstr "еПИЙЭККГСГ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 #, fuzzy
 msgid "Title"
 msgstr "_жэЙЕККОР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 #, fuzzy
 msgid "Profession"
 msgstr "е_МщЯЦЕИЕР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 #, fuzzy
 msgid "Manager"
 msgstr "еПИЙЭККГСГ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 #, fuzzy
 msgid "Spouse"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "Note"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "гЛЕЯОКЭЦИО"
@@ -1745,6 +2791,23 @@ msgstr ""
 msgid "_Font..."
 msgstr "пЯОТЕЯАИЭТГТА"
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "пЯОТЕЯАИЭТГТА"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1907,7 +2970,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
@@ -1917,150 +2980,140 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 msgid "Could not create the alarm notify service factory"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
+#: calendar/gui/calendar-commands.c:435
+#, c-format
+msgid "%d"
 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"
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+msgid "%d %B %Y"
+msgstr ""
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:586
+#: calendar/gui/calendar-commands.c:604
 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/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr ""
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr ""
 
-#: 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"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 #, fuzzy
 msgid "Normal"
 msgstr "аПЭ"
 
-#: 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 #, fuzzy
 msgid "Low"
 msgstr "_мщО"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "аПЭ"
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
-#: calendar/gui/e-calendar-table.c:382
-msgid "Opaque"
+#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2068,70 +3121,57 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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
-#, fuzzy
-msgid "None"
-msgstr "сГЛЕъЫ_ЛА"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr ""
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+#, fuzzy
+msgid "None"
+msgstr "сГЛЕъЫ_ЛА"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 #, fuzzy
 msgid "No"
 msgstr "_мщО"
@@ -2154,30 +3194,94 @@ msgstr ""
 msgid "Month View"
 msgstr "цМЫЯИЛъЕР"
 
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Summary contains"
+msgstr "лИЙЯэ еИЙОМъДИА"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "хщЛА"
+
+#: calendar/gui/cal-search-bar.c:58
+#, fuzzy
+msgid "Comment contains"
+msgstr "хщЛА"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+#, fuzzy
+msgid "Calendar"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: calendar/gui/component-factory.c:55
+#, fuzzy
+msgid "Folder containing appointments and events"
+msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ СТОИВЕъА ГЛЕЯОКОЦъОУ"
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "Tasks"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ СТОИВЕъА ГЛЕЯОКОЦъОУ"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "я_АМТЕБОЩ"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Create a new task"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+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
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2228,121 +3332,127 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "пЯЭВЕИЯА"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr "пЯЭВЕИЯА"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "цМЫЯИЛъЕР"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr "цМЫЯИЛъЕР"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "аПОСТОКч"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr "аПОСТОКч"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "аПОСТОКч"
@@ -2352,13 +3462,12 @@ msgstr "аПОСТОКч"
 msgid "_Options..."
 msgstr "е_МщЯЦЕИЕР"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "after"
 msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr ""
 
@@ -2377,7 +3486,7 @@ msgstr "я_АМТЕБОЩ"
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 #, fuzzy
 msgid "minute(s)"
 msgstr "цМЫЯИЛъЕР"
@@ -2398,210 +3507,225 @@ msgid "10 minutes"
 msgstr "цМЫЯИЛъЕР"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 #, fuzzy
 msgid "15 minutes"
 msgstr "цМЫЯИЛъЕР"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 #, fuzzy
 msgid "30 minutes"
 msgstr "цМЫЯИЛъЕР"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 #, fuzzy
 msgid "60 minutes"
 msgstr "цМЫЯИЛъЕР"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "е_МщЯЦЕИЕР"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
+msgid "Color for tasks due today"
 msgstr ""
 
 #: 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 "гЛЕЯОКЭЦИО"
+msgid "Create new appointments with a default _reminder"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
-msgid "Calendar Preferences"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "Days"
+msgstr "пЯЭВЕИЯА"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
+msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+#, fuzzy
+msgid "Friday"
+msgstr "пЯОТЕЯАИЭТГТА"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+#, fuzzy
+msgid "Hours"
+msgstr "мщА сУМТЭЛЕУСГ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
-msgstr ""
+#, fuzzy
+msgid "Minutes"
+msgstr "цМЫЯИЛъЕР"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:965
+#, fuzzy
+msgid "Monday"
+msgstr "счЛЕЯА"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
+msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:970
+#, fuzzy
+msgid "Saturday"
+msgstr "аПОСТОКч"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr ""
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "я_АМТЕБОЩ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
+msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr ""
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
-msgid "Friday"
-msgstr "пЯОТЕЯАИЭТГТА"
+msgid "Su_n"
+msgstr "аПОСТОКч"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+#, fuzzy
+msgid "Sunday"
+msgstr "аПОСТОКч"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
+msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-#, fuzzy
-msgid "Monday"
-msgstr "счЛЕЯА"
+msgid "T_ue"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
+msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:968
+#, fuzzy
+msgid "Thursday"
+msgstr "счЛЕЯА"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 #, fuzzy
-msgid "Remind me of all appointments"
-msgstr "я_АМТЕБОЩ"
+msgid "Time"
+msgstr "_жэЙЕККОР"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr "сГЛЕъЫ_ЛА"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr ""
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "е_МщЯЦЕИЕР"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-#, fuzzy
-msgid "Saturday"
-msgstr "аПОСТОКч"
+msgid "Time format:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:966
 #, fuzzy
-msgid "Show appointment end times in week and month views"
-msgstr "я_АМТЕБОЩ"
+msgid "Tuesday"
+msgstr "счЛЕЯА"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#, fuzzy
-msgid "Start of day:"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
+#: ui/evolution-calendar.xml.h:33
+msgid "Work Week"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
+msgid "_12 hour (AM/PM)"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-#, fuzzy
-msgid "Sunday"
-msgstr "аПОСТОКч"
+msgid "_24 hour"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "йАТэКОЦОР ЕЙЙЯЕЛОТчТЫМ"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr ""
+#, fuzzy
+msgid "_Display"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
 #, fuzzy
-msgid "Thursday"
-msgstr "счЛЕЯА"
+msgid "_End of day:"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
+msgid "_Fri"
 msgstr "_жэЙЕККОР"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
+msgid "_General"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr ""
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr "сГЛЕъЫ_ЛА"
+msgid "_Mon"
+msgstr "цМЫЯИЛъЕР"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr ""
+#, fuzzy
+msgid "_Other"
+msgstr "╤МОИ_ЦЛА"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
 #, fuzzy
-msgid "Tuesday"
-msgstr "счЛЕЯА"
+msgid "_Sat"
+msgstr "гЛЕЯОКЭЦИО"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr ""
+#, fuzzy
+msgid "_Task List"
+msgstr "йАТэКОЦОР ЕЙЙЯЕЛОТчТЫМ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
+msgid "_Wed"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Work Week"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr ""
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2663,73 +3787,68 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "еЙЙЯЕЛЭТГТЕР"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2775,45 +3894,38 @@ msgstr ""
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+msgid "Addressbook..."
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "е_МщЯЦЕИЕР"
+msgid "Delegate To:"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 #, fuzzy
-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 ""
+msgid "Enter Delegate"
+msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 #, fuzzy
 msgid "Appointment"
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 #, fuzzy
 msgid "Reminder"
 msgstr "аПОСТОКч"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 #, fuzzy
 msgid "Recurrence"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "еКчЖХГ"
@@ -2822,174 +3934,186 @@ msgstr "еКчЖХГ"
 msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+msgid "B_usy"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+msgid "Con_fidential"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Date & Time"
 msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+msgid "F_ree"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
 msgid "Pri_vate"
 msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Show Time As"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "аПОСТОКч"
 
-#: 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
+#: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
 msgid "_End time:"
 msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "е_МщЯЦЕИЕР"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "аПОСТОКч"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 msgid "_Delegate To..."
 msgstr ""
 
@@ -3028,20 +4152,19 @@ msgid "Role"
 msgstr "_лчМУЛА"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Status"
 msgstr "йАТэСТАСГ СЩМДЕСГР"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr ""
@@ -3085,15 +4208,14 @@ msgstr "цМЫЯИЛъЕР"
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 #, fuzzy
 msgid "occurrences"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-#, fuzzy
-msgid "Custom recurrence"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
+msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3105,28 +4227,34 @@ msgid "Exceptions"
 msgstr "е_МщЯЦЕИЕР"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-#, fuzzy
-msgid "No recurrence"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 #, fuzzy
 msgid "Recurrence Rule"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr ""
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "счЛЕЯА"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -3169,175 +4297,170 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "Date Completed:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
-#: 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:"
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #, fuzzy
-msgid "No one"
-msgstr "сГЛЕъЫ_ЛА"
+msgid "Progress"
+msgstr "е_МщЯЦЕИЕР"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:130
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #, fuzzy
-msgid "Task"
-msgstr "еЙЙЯЕЛЭ_ТГТА"
+msgid "_Priority:"
+msgstr "пЯОТЕЯАИЭТГТА"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Status:"
+msgstr "йАТэСТАСГ СЩМДЕСГР"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
 #, fuzzy
-msgid "Progress"
-msgstr "е_МщЯЦЕИЕР"
+msgid "Assignment"
+msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
-msgid "_Due Date:"
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-#, fuzzy
-msgid "_Priority:"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-#, fuzzy
-msgid "_Status:"
-msgstr "йАТэСТАСГ СЩМДЕСГР"
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "_Due Date:"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 #, fuzzy
 msgid "_Open"
 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "_Copy"
 msgstr "аМТИЦЯАЖч"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "_Paste"
 msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "_лчМУЛА"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "_лчМУЛА"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-calendar-table.c:1137
+#: calendar/gui/e-calendar-table.c:1130
 #, fuzzy
-msgid "Click here to add a task"
+msgid "Click to add a task"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: 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"
@@ -3373,25 +4496,25 @@ msgstr ""
 msgid "Priority"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Start Date"
 msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 #, fuzzy
 msgid "Summary"
 msgstr "аПОСТОКч"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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 ""
@@ -3403,153 +4526,260 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "счЛЕЯА"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, 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."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
-msgid "This is a meeting request."
+#: calendar/gui/e-itip-control.c:618
+#, fuzzy
+msgid "Meeting Information"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "еКчЖХГ"
+
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+
+#: calendar/gui/e-itip-control.c:637
+#, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "еКчЖХГ"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:643
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+msgid "Meeting Cancellation"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "йАТэКОЦОР ЕЙЙЯЕЛОТчТЫМ"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:691
+msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: calendar/gui/e-itip-control.c:713
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "еПИСЩМАЬГ"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+msgid "Update complete\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "_лчМУЛА"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "еПИЙЭККГСГ"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3592,44 +4822,27 @@ msgstr ""
 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
+#: calendar/gui/e-tasks.c:349
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, 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/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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3657,44 +4870,44 @@ 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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
 msgid "May"
 msgstr "счЛЕЯА"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "счЛЕЯА"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3851,13 +5064,6 @@ msgstr "аПЭ"
 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
-#, fuzzy
-msgid "Tasks"
-msgstr "еЙЙЯЕЛЭ_ТГТА"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3892,9 +5098,8 @@ msgid "Print Calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr ""
 
@@ -3908,7 +5113,7 @@ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 msgid "Print Setup"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
@@ -3945,6 +5150,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 ""
@@ -4005,7 +5306,7 @@ msgid "Unable to process spool folder"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
 #: camel/camel-filter-driver.c:667
-#, fuzzy
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "мщА ЛГМЩЛАТА"
 
@@ -4044,7 +5345,7 @@ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 msgid "Error executing filter: %s: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
@@ -4067,12 +5368,12 @@ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -4186,13 +5487,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -4210,15 +5511,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4252,7 +5553,7 @@ msgid "Connection cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4263,7 +5564,7 @@ msgstr ""
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
@@ -4381,42 +5682,69 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr ""
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4429,12 +5757,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4479,7 +5807,7 @@ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4487,7 +5815,7 @@ msgid ""
 msgstr "хщЛА"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4529,61 +5857,61 @@ msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 msgid "You cannot copy messages from this trash folder."
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
@@ -4597,7 +5925,7 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr ""
 
@@ -4606,7 +5934,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 #, fuzzy
 msgid "Folders"
 msgstr "_жэЙЕККОР"
@@ -4646,7 +5974,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
@@ -4657,7 +5985,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -4669,12 +5997,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4764,7 +6092,7 @@ msgstr ""
 #: 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-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4776,7 +6104,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
@@ -4844,20 +6172,20 @@ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 msgid "Cannot create folder lock on %s: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: 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:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: 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-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4867,12 +6195,12 @@ msgid ""
 "  %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
@@ -4915,13 +6243,13 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing 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"
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4931,25 +6259,23 @@ 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 ""
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
+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:1516
-msgid "Synchronising folder"
-msgstr ""
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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 ""
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -5051,6 +6377,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5139,40 +6476,40 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, fuzzy, c-format
-msgid "Retrieving POP message %d"
-msgstr "мщА ЛГМЩЛАТА"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "мщА ЛГМЩЛАТА"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 #, fuzzy
 msgid "Message storage"
@@ -5188,7 +6525,7 @@ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 msgid "Delete after %s day(s)"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr ""
 
@@ -5267,7 +6604,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sendmail"
 msgstr "аПОСТОКч"
@@ -5321,7 +6658,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
@@ -5329,124 +6666,124 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Help message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 #, fuzzy
 msgid "Service ready"
 msgstr "аПОСТОКч"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5454,126 +6791,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 #, fuzzy
 msgid "Sending message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
+#: camel/providers/smtp/camel-smtp-transport.c:760
+msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
-msgid "SMTP Authentication"
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5603,7 +6940,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 #, fuzzy
 msgid "attachment"
 msgstr "мЕА ЕПИСЩМАЬГ"
@@ -5639,14 +6976,14 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 #, fuzzy
 msgid "From:"
 msgstr "аПЭ"
@@ -5654,38 +6991,38 @@ msgstr "аПЭ"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "хщЛА:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "пЯОР:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "аМТъЦЯАЖО:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "еИСэЦЕТЕ ТИР ДИЕУХЩМСЕИР ЭПОУ ХА СТАКЕъ АМТъЦЯАЖО ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "йЯУЖЭ АМТъЦЯАЖО:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5712,97 +7049,97 @@ msgid ""
 "%s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 #, fuzzy
 msgid "Open file"
 msgstr "╤МОИЦЛА жАЙщККОУ"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 #, fuzzy
 msgid "Compose a message"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr ""
 
@@ -5830,55 +7167,100 @@ msgstr ""
 msgid "calendar information"
 msgstr ""
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "е_МщЯЦЕИЕР"
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr ""
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "хщЛА"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "хщЛА"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "хщЛА"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "хщЛА"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr ""
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr ""
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr ""
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5886,13 +7268,13 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:303
+#: e-util/e-time-utils.c:313
 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
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
@@ -5986,7 +7368,7 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr ""
 
@@ -5998,11 +7380,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 #, fuzzy
 msgid "Filter Rules"
 msgstr "_жэЙЕККОР"
@@ -6023,21 +7409,21 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 #, fuzzy
 msgid "Select Folder"
 msgstr "_мщОР жэЙЕККОР"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6057,65 +7443,54 @@ msgstr "лЕТОМОЛАСъА оЛэДАР"
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 #, fuzzy
 msgid "Execute actions"
 msgstr "е_МщЯЦЕИЕР"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 #, fuzzy
 msgid "Edit Filters"
 msgstr "_жэЙЕККОР"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "_жэЙЕККОР"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "_жэЙЕККОР"
@@ -6141,207 +7516,208 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
-#: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "contains"
-msgstr "е_МщЯЦЕИЕР"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Date received"
 msgstr "еКчЖХГ"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "Date sent"
 msgstr "еПИЙЭККГСГ"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr ""
 
-#: 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
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Draft"
 msgstr "еПИЙЭККГСГ"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 #, fuzzy
 msgid "Expression"
 msgstr "е_МщЯЦЕИЕР"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 #, fuzzy
 msgid "Message Body"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 #, fuzzy
 msgid "Message Header"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Message was sent"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Move to Folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: 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
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Read"
 msgstr "дИАЦЯАЖч"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 #, fuzzy
 msgid "Sender"
 msgstr "аПОСТОКч"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 #, fuzzy
 msgid "Set Status"
 msgstr "йАТэСТАСГ СЩМДЕСГР"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "лщЦЕХОР"
 
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "Source Account"
+msgstr "лИЙЯэ еИЙОМъДИА"
+
+#: filter/libfilter-i18n.h:30
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:32
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "хщЛА"
+
+#: filter/libfilter-i18n.h:36
+#, fuzzy
+msgid "contains"
+msgstr "е_МщЯЦЕИЕР"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr ""
+
 #: filter/libfilter-i18n.h:45
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "Source Account"
-msgstr "лИЙЯэ еИЙОМъДИА"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "starts with"
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:50
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
-#: mail/message-list.etspec.h:9
-msgid "Subject"
-msgstr "хщЛА"
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:52
 msgid "was after"
@@ -6376,14 +7752,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "_лчМУЛА"
@@ -6410,12 +7785,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "е_МщЯЦЕИЕР"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6476,185 +7851,204 @@ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 msgid "Mail configuration interface"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "иДИЭТГТЕР"
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr ""
 
 #: mail/component-factory.c:757
 #, fuzzy
+msgid "New Mail Message"
+msgstr "_лчМУЛА"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "_лчМУЛА"
+
+#: mail/component-factory.c:789
+#, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "иДИЭТГТЕР"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 #, fuzzy
 msgid "Properties"
 msgstr "иДИЭТГТЕР"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:893
+#: mail/folder-browser.c:909
 #, fuzzy
-msgid "Store search as vFolder"
-msgstr "_мщОР жэЙЕККОР"
+msgid "Create vFolder from Search"
+msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "хщЛА"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "хщЛА"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "хщЛА"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:1273
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "Resend"
-msgstr "аПОСТОКч"
+msgid "_Edit as New Message..."
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Save As..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 #, fuzzy
 msgid "_Print"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 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
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_жэЙЕККОР"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6719,55 +8113,60 @@ msgid "Evolution News Editor"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 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
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr ""
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 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-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "е_МщЯЦЕИЕР"
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6814,17 +8213,17 @@ msgid ""
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6832,204 +8231,233 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 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:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr ""
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "_жэЙЕККОР"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 #, fuzzy
 msgid "Print Message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "еИСЕЯВЭЛЕМА"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr ""
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "Account"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account Information"
 msgstr "еПИСЩМАЬГ"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Accounts"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7039,308 +8467,372 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Done"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 #, fuzzy
 msgid "Drafts"
 msgstr "еПИЙЭККГСГ"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 #, 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
-#, fuzzy
-msgid "Email Address:"
-msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
-
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
+#: mail/mail-config.glade.h:30
+msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
-msgid "Enabled"
+#: mail/mail-config.glade.h:31
+msgid "Each account must have a different name."
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
 #, fuzzy
-msgid "Full Name:"
-msgstr "лЕТОМОЛАСъА оЛэДАР"
+msgid "Edit..."
+msgstr "пЯОТЕЯАИЭТГТА"
 
-#: mail/mail-config.glade.h:41
-msgid "Get Digital ID..."
+#: mail/mail-config.glade.h:33
+msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
-msgid "HTML Signature:"
+#: mail/mail-config.glade.h:34
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
+#: mail/mail-config.glade.h:35
+msgid "HTML signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "аПОСТОКч"
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "аПЭ"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
+#: mail/mail-config.glade.h:44
+msgid "Make this my _default account"
 msgstr ""
 
-#: 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"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "News"
 msgstr "_мщО"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Optional Information"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr ""
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Prompt when sending messages with an empty subject"
+#: mail/mail-config.glade.h:57
+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"
+#: mail/mail-config.glade.h:58
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
-msgid "Select PGP binary"
-msgstr ""
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
+#: mail/mail-config.glade.h:69
+msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Sending Email"
 msgstr "аПОСТОКч"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "аПОСТОКч"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Sent"
 msgstr "аПОСТОКч"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Server Configuration"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Type: "
 msgstr "аПОСТОКч"
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+msgid "Server requires _authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "еПИСЩМАЬГ"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Sources"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "_жэЙЕККОР"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
+#: mail/mail-config.glade.h:86
+msgid "Use secure connection (_SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:87
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+msgid "_Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+msgid "_Check for supported types"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "лЕТОМОЛАСъА оЛэДАР"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: mail/mail-config.glade.h:100
+msgid "_Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+msgid "_Host:"
+msgstr ""
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
 #: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+msgid "_Log filter actions to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Username:"
-msgstr "сГЛЕъЫ_ЛА"
+msgid "_Mark messages as Read after"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
 #: mail/mail-config.glade.h:105
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
+#, fuzzy
+msgid "_Name:"
+msgstr "лЕТОМОЛАСъА оЛэДАР"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "_Organization:"
 msgstr ""
 
+#: mail/mail-config.glade.h:108
+msgid "_PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "еПИЙЭККГСГ"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
+
 #: mail/mail-config.glade.h:112
-msgid "newswindow1"
+msgid "_Send mail in HTML format by default."
 msgstr ""
 
 #: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: mail/mail-config.glade.h:116
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "seconds."
 msgstr "аПОСТОКч"
@@ -7381,207 +8873,218 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 #, fuzzy
 msgid "Save Attachment"
 msgstr "мщА ЕПИСЩМАЬГ..."
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 #, fuzzy
 msgid "Loading message content"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_цМЫЯИЛъА"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "аПОСТОКч"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "аПОСТОКч"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 #, fuzzy
 msgid "Date"
 msgstr "еПИЙЭККГСГ"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 #, fuzzy
 msgid "From"
 msgstr "аПЭ"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "еКчЖХГ"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "пЯОР"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "аМТъЦЯАЖО:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 #, fuzzy
 msgid "Encrypted message"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:330
 #, fuzzy, c-format
-msgid "Opening '%s'"
+msgid "No such folder /%s"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, 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
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "тО Evolution ДЕ ЛПОЯЕъ МА ДГЛИОУЯЦчСЕИ ТОУР ТОПИЙОЩР ЖАЙщККОУР"
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "_мщОР жэЙЕККОР"
@@ -7600,215 +9103,235 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "_мщОР жэЙЕККОР"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "аПОСТОКч"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 #, fuzzy
 msgid "Copying"
 msgstr "аМТИЦЯАЖч"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 #, fuzzy
 msgid "Trash"
 msgstr "еЙЙЯЕЛЭ_ТГТА"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_мщОР жэЙЕККОР"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 #, fuzzy
 msgid "Saving attachment"
 msgstr "мщА ЕПИСЩМАЬГ..."
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "гЛЕЯОКЭЦИО"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "еПИЙЭККГСГ"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:253
-#, fuzzy
-msgid "Receiving"
-msgstr "еКчЖХГ"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "е_МщЯЦЕИЕР"
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "е_МщЯЦЕИЕР"
 
-#: mail/mail-send-recv.c:323
-#, fuzzy
-msgid "Sending"
-msgstr "аПОСТОКч"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr ""
 
@@ -7827,87 +9350,93 @@ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 msgid "Forwarded message"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 #, fuzzy
 msgid "VFolders"
 msgstr "_жэЙЕККОР"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 #, fuzzy
 msgid "New VFolder"
 msgstr "_мщОР жэЙЕККОР"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "хщЛА"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 #, fuzzy
 msgid "Seen"
 msgstr "аПОСТОКч"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
 #: mail/message-list.etspec.h:2
@@ -7923,40 +9452,77 @@ msgstr "еКчЖХГ"
 msgid "Size"
 msgstr "лщЦЕХОР"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Folder"
-msgstr "_жэЙЕККОР"
-
-#: mail/subscribe-dialog.c:77
-#, fuzzy
-msgid "Store"
-msgstr "мщА сУМТЭЛЕУСГ"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr ""
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, c-format
-msgid "Getting store for \"%s\""
+msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Folder"
+msgstr "_жэЙЕККОР"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+msgid " _Refresh List "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "_жэЙЕККОР"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr ""
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "мщА сУМТЭЛЕУСГ"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -7966,55 +9532,72 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 #, fuzzy
 msgid "Appointments"
 msgstr "я_АМТЕБОЩ"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "я_АМТЕБОЩ"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 msgid "%l:%M%p"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 msgid "%a %l:%M%p"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "аПОСТОКч"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 #, fuzzy
 msgid "Add a news feed"
 msgstr "мщА оЛэДА"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+msgid "Summary Settings"
+msgstr "пЕЯъКГЬГ"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8025,7 +9608,12 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
@@ -8034,26 +9622,31 @@ msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "еПИЙЭККГСГ"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "е_МщЯЦЕИЕР"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %Y"
 msgstr ""
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "пЯОТЕЯАИЭТГТА"
+msgid "Print Summary"
+msgstr "аПОСТОКч"
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr ""
 
 #: my-evolution/main.c:52
@@ -8061,6 +9654,41 @@ msgstr ""
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "цМЫЯИЛъЕР"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_жэЙЕККОР"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_жэЙЕККОР"
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9234,121 +10862,139 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "мщА оЛэДА"
+msgid " _Remove"
+msgstr "дИАЦЯАЖч"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "_жэЙЕККОР"
+msgid "Add n_ew feed"
+msgstr "мщА оЛэДА"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "е_МщЯЦЕИЕР"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "е_МщЯЦЕИЕР"
+msgid "All _folders:"
+msgstr "_жэЙЕККОР"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "All news _feeds:"
+msgstr "мщА оЛэДА"
 
 #: my-evolution/my-evolution.glade.h:7
-msgid "Display stations:"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "Displayed feeds:"
+msgid "Ma_x number of items shown:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "пЯОТЕЯАИЭТГТА"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
+#, fuzzy
+msgid "One mont_h"
+msgstr "цМЫЯИЛъЕР"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "One w_eek"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 
 #: my-evolution/my-evolution.glade.h:14
 #, fuzzy
-msgid "News Feeds"
-msgstr "мщА сУМТЭЛЕУСГ"
+msgid "Show _today's tasks"
+msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "счЛЕЯА"
+msgid "Tasks "
+msgstr "еЙЙЯЕЛЭ_ТГТА"
 
 #: my-evolution/my-evolution.glade.h:16
-#, fuzzy
-msgid "One month"
-msgstr "цМЫЯИЛъЕР"
-
-#: my-evolution/my-evolution.glade.h:17
-msgid "One week"
+msgid "Units: "
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
-msgstr ""
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "Weather settings"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr "_жэЙЕККОР"
+msgid "_Display folders:"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+msgid "_Display stations:"
+msgstr "е_МщЯЦЕИЕР"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
-msgstr ""
+#, fuzzy
+msgid "_Displayed feeds:"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+msgid "_Five days"
+msgstr "пЯОТЕЯАИЭТГТА"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "еЙЙЯЕЛЭ_ТГТА"
+msgid "_Mail"
+msgstr "_лчМУЛА"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
-msgstr ""
+#, fuzzy
+msgid "_News Feeds"
+msgstr "мщА сУМТЭЛЕУСГ"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "еПИЙЭККГСГ"
+msgid "_One day"
+msgstr "счЛЕЯА"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "еПИЙЭККГСГ"
+msgid "_Schedule"
+msgstr "_жэЙЕККОР"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "лЕТОМОЛАСъА оЛэДАР"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "еПИЙЭККГСГ"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "еПИЙЭККГСГ"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9364,7 +11010,17 @@ msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "еИСЕЯВЭЛЕМА"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "еИСЕЯВЭЛЕМА"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "_жэЙЕККОР"
@@ -9410,7 +11066,7 @@ msgid ""
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9418,7 +11074,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9427,7 +11083,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9435,54 +11091,76 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "лЕТОМОЛАСъА оЛэДАР"
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "лЕТОМОЛАСъА оЛэДАР"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
@@ -9494,7 +11172,7 @@ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "тО Evolution ДЕ ЛПОЯЕъ МА ДГЛИОУЯЦчСЕИ ТОУР ТОПИЙОЩР ЖАЙщККОУР"
@@ -9505,12 +11183,12 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 #, fuzzy
 msgid "New..."
 msgstr "_мщО"
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr ""
 
@@ -9540,7 +11218,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9584,7 +11262,7 @@ msgstr ""
 msgid "Filename:"
 msgstr "лЕТОМОЛАСъА оЛэДАР"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 #, fuzzy
 msgid "Select a file"
 msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
@@ -9594,308 +11272,329 @@ msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 msgid "File type:"
 msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "_мщОР жэЙЕККОР"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 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:437
+#: shell/e-shell-view-menu.c:423
 #, fuzzy
 msgid "Go to folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1311
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:1644
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:1646
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 #, fuzzy
 msgid "_Small Icons"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 #, fuzzy
 msgid "_Large Icons"
 msgstr "лЕЦэКА еИЙОМъДИА"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 #, fuzzy
 msgid "_New Group..."
 msgstr "мщА оЛэДА"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "дИАЦЯАЖч оЛэДАР"
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "дИАЦЯАЖч оЛэДАР"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
 
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-#, fuzzy
-msgid "Open"
-msgstr "╤МОИ_ЦЛА"
-
-#: shell/e-shortcuts-view.c:474
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New Window"
 msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, fuzzy
 msgid "Shortcuts"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-shortcuts.c:984
-#, fuzzy
-msgid "Inbox"
-msgstr "еИСЕЯВЭЛЕМА"
-
-#: shell/e-shortcuts.c:987
-#, fuzzy
-msgid "Contacts"
-msgstr "_цМЫЯИЛъА"
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr ""
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+msgid "The specified folder cannot be modified or removed"
+msgstr ""
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
@@ -9916,11 +11615,6 @@ msgstr ""
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#, fuzzy
-msgid "Folder name:"
-msgstr "лЕТОМОЛАСъА оЛэДАР"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder type:"
@@ -9937,18 +11631,27 @@ msgstr ""
 
 #: shell/importer/import.glade.h:2
 #, fuzzy
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Utility"
+msgid "Evolution Importer Assistant"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -9966,10 +11669,10 @@ msgid "Don't ask me again"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9986,32 +11689,37 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "аМТИЦЯАЖч"
 
@@ -10030,11 +11738,11 @@ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 msgid "Create new contact list"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "йОПч"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr ""
 
@@ -10043,86 +11751,128 @@ msgstr ""
 msgid "Delete selected contacts"
 msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
 
-#: ui/evolution-addressbook.xml.h:10
-#, fuzzy
-msgid "New contact"
-msgstr "_цМЫЯИЛъА"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "_мщО"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "еПИЙЭККГСГ"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "еПИЙЭККГСГ АМТИЙЕИЛщМОУ АПО ТО ПЯЭВЕИЯО"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
+
+#: ui/evolution-addressbook.xml.h:21
 #, fuzzy
 msgid "Select All"
 msgstr "_мщОР жэЙЕККОР"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "_цМЫЯИЛъА"
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
+
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "_цМЫЯИЛъА"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Stop"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "е_МщЯЦЕИЕР"
+
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Contact"
 msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
+#, fuzzy
+msgid "_Contact List"
+msgstr "_цМЫЯИЛъА"
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Forward Contact..."
 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
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 #, fuzzy
 msgid "_Print..."
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
+msgstr "кОИПщР сУМТОЛЕЩСЕИР"
+
+#: ui/evolution-addressbook.xml.h:39
 #, 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "е_ЯЦАКЕъА"
 
@@ -10132,119 +11882,134 @@ 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 _Task"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #: ui/evolution-calendar.xml.h:6
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Day"
+msgstr "пЯЭВЕИЯА"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "счЛЕЯА"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
-msgstr ""
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr ""
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "счЛЕЯА"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "цМЫЯИЛъЕР"
+
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "New Appointment"
 msgstr "я_АМТЕБОЩ"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+#, fuzzy
+msgid "New Task"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 #, fuzzy
-msgid "Print calendar"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "Print Pre_view"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Print this Calendar"
+msgid "Print this calendar"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
-msgid "Show 1 day"
+msgid "Show one day"
 msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
-msgstr ""
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
+msgstr "цМЫЯИЛъЕР"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "я_АМТЕБОЩ"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:41
 #, fuzzy
-msgid "_Day"
-msgstr "пЯЭВЕИЯА"
+msgid "_Publish Free/Busy Information"
+msgstr "еПИСЩМАЬГ"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
-msgid "_Month"
-msgstr "цМЫЯИЛъЕР"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr ""
+msgid "_Task..."
+msgstr "еЙЙЯЕЛЭ_ТГТА"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10256,16 +12021,16 @@ msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
-msgid "Close this appointment"
+msgid "Close this item"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-comp-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 #, fuzzy
-msgid "Delete this appointment"
+msgid "Delete this item"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr ""
 
@@ -10274,126 +12039,90 @@ msgstr ""
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 #, fuzzy
 msgid "Print..."
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+#, fuzzy
+msgid "Save"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: ui/evolution-comp-editor.xml.h:14
 #, fuzzy
 msgid "Save and Close"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 #, 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 ""
-
-#: ui/evolution-contact-editor.xml.h:4
-#, fuzzy
-msgid "Help"
-msgstr "сГЛЕъЫ_ЛА"
-
 #: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "пЯОТЕЯАИЭТГТА"
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:13
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "_цМЫЯИЛъА"
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-contact-list-editor.xml.h:6
-msgid "Save the list and close the dialog box"
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
 msgstr ""
 
 #: ui/evolution-contact-list-editor.xml.h:7
+msgid "Save the list and close the dialog box"
+msgstr ""
+
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "_цМЫЯИЛъА"
@@ -10402,21 +12131,21 @@ msgstr "_цМЫЯИЛъА"
 msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10428,15 +12157,10 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-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 "е_МщЯЦЕИЕР"
-
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customise My Evolution"
 msgstr ""
@@ -10452,71 +12176,67 @@ msgstr "йКЕъСИЛО ЭКЫМ ТЫМ АМОИВТЧМ АМТИЙЕИЛщМЫМ"
 
 #: ui/evolution-mail-global.xml.h:3
 #, fuzzy
-msgid "Compose"
-msgstr "мщА сУМТЭЛЕУСГ"
-
-#: ui/evolution-mail-global.xml.h:4
-#, fuzzy
 msgid "Compose _New Message"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 #, fuzzy
 msgid "Forget _Passwords"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr ""
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Send / Receive"
 msgstr "еКчЖХГ"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Show message preview window"
 msgstr "╦АМ ХщКЕТЕ ч ОВИ ПЯОЕПИСЙЭПИСГ ЛГМУЛэТЫМ"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "_жэЙЕККОР"
@@ -10545,102 +12265,112 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr "еКчЖХГ"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "йОПч"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "еПИЙЭККГСГ АМТИЙЕИЛщМОУ АПО ТО ПЯЭВЕИЯО"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 #, fuzzy
 msgid "Select _All"
 msgstr "_мщОР жэЙЕККОР"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
 msgid "Select _Thread"
 msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 #, fuzzy
-msgid "Show _All"
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+msgid "Sh_ow Hidden Messages"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Temporarily hide all messages that have already been read"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
@@ -10649,7 +12379,7 @@ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_жэЙЕККОР"
 
@@ -10657,12 +12387,12 @@ msgstr "_жэЙЕККОР"
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
 msgid "_Properties..."
 msgstr "иДИЭТГТЕР"
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
@@ -10916,7 +12646,7 @@ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
 #: ui/evolution-mail-message.xml.h:58
 #, fuzzy
-msgid "Previews the message to be printed"
+msgid "Preview the message to be printed"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10938,43 +12668,37 @@ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 msgid "Previous Unread Message"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
@@ -11024,76 +12748,59 @@ msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 msgid "VFolder on _Subject..."
 msgstr "хщЛА"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "_жэЙЕККОР"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close this window"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 #, fuzzy
 msgid "_View"
 msgstr "_мщО"
@@ -11164,12 +12871,6 @@ 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"
@@ -11313,7 +13014,7 @@ msgstr ""
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Help"
 msgstr "сГЛЕъЫ_ЛА"
@@ -11350,15 +13051,28 @@ msgstr ""
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "_цМЫЯИЛъА"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "еЙЙЯЕЛЭ_ТГТА"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Cancel this task"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr ""
 
@@ -11366,46 +13080,32 @@ msgstr ""
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-tasks.xml.h:4
-#, fuzzy
-msgid "Create a new task"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-tasks.xml.h:8
-#, fuzzy
-msgid "New Task"
-msgstr "еЙЙЯЕЛЭ_ТГТА"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Task"
 msgstr "еЙЙЯЕЛЭ_ТГТА"
@@ -11442,200 +13142,173 @@ msgstr ""
 msgid "Create a new folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:19
-#, fuzzy
-msgid "Getting _Started"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Toggle"
 msgstr "_лчМУЛА"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 #, 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:35
-#, fuzzy
-msgid "Using the _Calendar"
-msgstr "гЛЕЯОКЭЦИО"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr ""
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "View the selected folder"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:41
-#, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "я_АМТЕБОЩ"
-
-#: ui/evolution.xml.h:43
-#, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "_цМЫЯИЛъА"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "аМТИЦЯАЖч"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_жэЙЕККОР"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:42
 #, fuzzy
-msgid "_Import file..."
+msgid "_Import File..."
 msgstr "иДИЭТГТЕР"
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr ""
-
-#: ui/evolution.xml.h:54
-#, fuzzy
-msgid "_Mail message"
-msgstr "_лчМУЛА"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "_лчМУЛА"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_мщО"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_New Folder"
 msgstr "_мщОР жэЙЕККОР"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "╤МОИ_ЦЛА"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: ui/evolution.xml.h:61
-#, fuzzy
-msgid "_Task (FIXME)"
-msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr ""
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr ""
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
-msgstr "е_МщЯЦЕИЕР"
+msgid "Print summary"
+msgstr "аПОСТОКч"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "дИАЦЯАЖч"
+
+#: ui/my-evolution.xml.h:6
+#, fuzzy
+msgid "Reload the view"
+msgstr "мщА ЛГМЩЛАТА"
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "пЕЯъКГЬГ"
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
@@ -11675,6 +13348,28 @@ msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 msgid "With Category"
 msgstr ""
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "е_МщЯЦЕИЕР"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11682,10 +13377,6 @@ msgstr ""
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr ""
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
@@ -11761,7 +13452,7 @@ msgstr ""
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11771,21 +13462,22 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 #, fuzzy
 msgid "Now"
 msgstr "_мщО"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 #, fuzzy
 msgid "Today"
 msgstr "счЛЕЯА"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -11871,38 +13563,34 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "_цМЫЯИЛъА"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 #, fuzzy
 msgid "Save Search"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: widgets/misc/e-filter-bar.c:241
+#: widgets/misc/e-filter-bar.h:94
 #, fuzzy
-msgid "Advanced Search"
-msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
+msgid "Add to Saved Searches"
+msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "гЛЕЯОКЭЦИО"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:104
-#, fuzzy
-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 ""
@@ -11922,10 +13610,15 @@ msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 msgid "Don't show this message again."
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr ""
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "пЯОТЕЯАИЭТГТА"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -11951,6 +13644,154 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
 #, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "аПОСТОКч"
+
+#, fuzzy
+#~ msgid "LDAP Server"
+#~ msgstr "мщА оЛэДА"
+
+#, fuzzy
+#~ msgid "Unknown addressbook type"
+#~ msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#, fuzzy
+#~ msgid "Subtree"
+#~ msgstr "мщА сУМТЭЛЕУСГ"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "гЛЕЯОКЭЦИО"
+
+#, fuzzy
+#~ msgid "Calendar Preferences"
+#~ msgstr "гЛЕЯОКЭЦИО"
+
+#, fuzzy
+#~ msgid "Remind me of all appointments"
+#~ msgstr "я_АМТЕБОЩ"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "сГЛЕъЫ_ЛА"
+
+#, fuzzy
+#~ msgid "Task"
+#~ msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#, fuzzy
+#~ msgid "Store search as vFolder"
+#~ msgstr "_мщОР жэЙЕККОР"
+
+#, fuzzy
+#~ msgid "Resend"
+#~ msgstr "аПОСТОКч"
+
+#, fuzzy
+#~ msgid "Receiving"
+#~ msgstr "еКчЖХГ"
+
+#, fuzzy
+#~ msgid "Store"
+#~ msgstr "мщА сУМТЭЛЕУСГ"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "пЯОТЕЯАИЭТГТА"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#, fuzzy
+#~ msgid "New contact"
+#~ msgstr "_цМЫЯИЛъА"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "_цМЫЯИЛъА"
+
+#, fuzzy
+#~ msgid "Print this Calendar"
+#~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+
+#, fuzzy
+#~ msgid "_Day"
+#~ msgstr "пЯЭВЕИЯА"
+
+#, fuzzy
+#~ msgid "Close this appointment"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "пЯОТЕЯАИЭТГТА"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "е_МщЯЦЕИЕР"
+
+#, fuzzy
+#~ msgid "Help"
+#~ msgstr "сГЛЕъЫ_ЛА"
+
+#, fuzzy
+#~ msgid "Show _All"
+#~ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Getting _Started"
+#~ msgstr "аъ_ТГСГ сУМэМТГСГР"
+
+#, fuzzy
+#~ msgid "Using the _Calendar"
+#~ msgstr "гЛЕЯОКЭЦИО"
+
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "я_АМТЕБОЩ"
+
+#, fuzzy
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_цМЫЯИЛъА"
+
+#, fuzzy
+#~ msgid "_Mail message"
+#~ msgstr "_лчМУЛА"
+
+#, fuzzy
+#~ msgid "_Task (FIXME)"
+#~ msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "е_МщЯЦЕИЕР"
+
+#, fuzzy
 #~ msgid "TasksPreferences"
 #~ msgstr "гЛЕЯОКЭЦИО"
 
@@ -11975,10 +13816,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
 #, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "еЙЙЯЕЛЭ_ТГТА"
-
-#, fuzzy
 #~ msgid "Visual Alarms"
 #~ msgstr "_жэЙЕККОР"
 
@@ -11987,10 +13824,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
 #, fuzzy
-#~ msgid "Go to Today"
-#~ msgstr "счЛЕЯА"
-
-#, fuzzy
 #~ msgid "I don't recognize this type of calendar component."
 #~ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
@@ -12041,10 +13874,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
 #, fuzzy
-#~ msgid "RDF Summary"
-#~ msgstr "аПОСТОКч"
-
-#, fuzzy
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
@@ -12109,10 +13938,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #, fuzzy
-#~ msgid "Day"
-#~ msgstr "пЯЭВЕИЯА"
-
-#, fuzzy
 #~ msgid "Open Calendar"
 #~ msgstr "гЛЕЯОКЭЦИО"
 
@@ -12129,10 +13954,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "гЛЕЯОКЭЦИО"
-
-#, fuzzy
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "_лчМУЛА"
 
@@ -12201,14 +14022,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #, fuzzy
-#~ msgid "Executive Summary Settings..."
-#~ msgstr "пЕЯъКГЬГ"
-
-#, fuzzy
-#~ msgid "New Mail"
-#~ msgstr "_лчМУЛА"
-
-#, fuzzy
 #~ msgid "Configure Folder..."
 #~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
@@ -12217,10 +14030,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
 #, fuzzy
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
-
-#, fuzzy
 #~ msgid "Move message to a new folder"
 #~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
@@ -12245,10 +14054,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #, fuzzy
-#~ msgid "Assig_n Task (FIXME)"
-#~ msgstr "_цМЫЯИЛъА"
-
-#, fuzzy
 #~ msgid "Meeting Re_quest (FIXME)"
 #~ msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
 
@@ -12300,8 +14105,8 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ "An error occured when trying to fetch\n"
 #~ "pilot list from the gnome-pilot daemon"
 #~ msgstr ""
-#~ "пЯОщЙУЬЕ ЕНАъЯЕСГ ЙАТэ ТГМ АПЭПЕИЯА АМэЦМЫСГР ДЕДОЛщМЫМ ЛЕ PersistStream АПЭ "
-#~ "ТГ ЛОМэДА"
+#~ "пЯОщЙУЬЕ ЕНАъЯЕСГ ЙАТэ ТГМ АПЭПЕИЯА АМэЦМЫСГР ДЕДОЛщМЫМ ЛЕ PersistStream "
+#~ "АПЭ ТГ ЛОМэДА"
 
 #, fuzzy
 #~ msgid "Evolution Calendar Conduit"
@@ -12335,26 +14140,14 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "_жэЙЕККОР"
 
 #, fuzzy
-#~ msgid "Subject contains"
-#~ msgstr "хщЛА"
-
-#, fuzzy
 #~ msgid "FIXME: _Appointment"
 #~ msgstr "я_АМТЕБОЩ"
 
 #, fuzzy
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
-
-#, fuzzy
 #~ msgid "FIXME: _Contact"
 #~ msgstr "_цМЫЯИЛъА"
 
 #, fuzzy
-#~ msgid "FIXME: Task _Request"
-#~ msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
-
-#, fuzzy
 #~ msgid "FIXME: _Journal Entry"
 #~ msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
 
@@ -12435,10 +14228,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
 #, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
-
-#, fuzzy
 #~ msgid "FIXME: _New Appointment"
 #~ msgstr "я_АМТЕБОЩ"
 
@@ -12471,10 +14260,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "сГЛЕъЫ_ЛА"
 
 #, fuzzy
-#~ msgid "today"
-#~ msgstr "счЛЕЯА"
-
-#, fuzzy
 #~ msgid "ninth"
 #~ msgstr "пЯОТЕЯАИЭТГТА"
 
@@ -12491,10 +14276,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "мщА ЛГМЩЛАТА"
 
 #, fuzzy
-#~ msgid "Rebuild message view"
-#~ msgstr "мщА ЛГМЩЛАТА"
-
-#, fuzzy
 #~ msgid "Gnome Calendar"
 #~ msgstr "гЛЕЯОКЭЦИО"
 
@@ -12557,7 +14338,8 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
 #~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
 #~ msgstr ""
-#~ "лАР СУЦВЬЯЕъТЕ, Г АЯВИЙОПОъГСГ ТОУ ЕНЕЯЕУМГТч ЖАЙщККЫМ ТОУ Evolution АПщТУВЕ."
+#~ "лАР СУЦВЬЯЕъТЕ, Г АЯВИЙОПОъГСГ ТОУ ЕНЕЯЕУМГТч ЖАЙщККЫМ ТОУ Evolution "
+#~ "АПщТУВЕ."
 
 #~ msgid "Clos_e All Items"
 #~ msgstr "йК_ЕъСИЛО ╪КЫМ"
@@ -12591,9 +14373,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgid "The %s component doesn't support PersistStream!\n"
 #~ msgstr "г ЛОМэДА %s ДЕМ УПОСТГЯъФЕИ ТА PersistStream!\n"
 
-#~ msgid "A folder containing calendar entries"
-#~ msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ СТОИВЕъА ГЛЕЯОКОЦъОУ"
-
 #~ msgid "A service containing mail items"
 #~ msgstr "уПГЯЕСъА ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 7ddc719700..2156265d31 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady <rwb197@zepler.org> 2000
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -21,197 +22,197 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -227,13 +228,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -252,8 +253,8 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -268,20 +269,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -331,200 +332,191 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
+#: addressbook/gui/component/addressbook-component.c:386
+msgid "New _Contact"
 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"
+#: addressbook/gui/component/addressbook-component.c:387
+msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
+#: addressbook/gui/component/addressbook-component.c:387
+msgid "New Contact _List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
 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"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Advanced"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+msgid "Basic"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "De_lete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Search _base:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:11
+msgid "Search s_cope: "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:12
+msgid "Server Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid ""
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:20
 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:"
+"This name will be used to identify your account. It is for display purposes "
+"only."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:21
+msgid "_Account name:"
 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:"
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
+msgid "_Add"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:36
+msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid "_My server requires authentication"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "De_lete"
+#: addressbook/gui/component/addressbook-config.glade.h:25
+msgid "_Port:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
+#: addressbook/gui/component/addressbook-config.glade.h:26
+msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
+#: addressbook/gui/component/addressbook-storage.c:138
+msgid "Other Contacts"
 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"
+#: addressbook/gui/component/addressbook.c:386
+#, c-format
+msgid "Please enter your email address and password for access to %s"
 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"
+#: addressbook/gui/component/addressbook.c:394
+msgid "LDAP Authentication"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:118
-msgid "Other Contacts"
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/component/addressbook.c:418
+msgid "Password:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -532,47 +524,70 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Category contains"
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
+msgid "Category is"
+msgstr ""
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:707
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+msgid "Any Category"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:912
 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 ""
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr ""
 
@@ -594,19 +609,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr ""
 
@@ -627,13 +642,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr ""
 
@@ -645,33 +657,48 @@ msgstr ""
 msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
+msgid "C_ontaining:"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
+msgid "Co_ntacts:"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
+msgid "F_ind"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "_Category:"
+msgid "Select Names"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "_Category:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "_Folder:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "_Message Recipients:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -687,8 +714,8 @@ 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -697,16 +724,15 @@ msgid "Contact Editor"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+msgid "File A_s:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr ""
 
@@ -731,239 +757,1170 @@ msgstr ""
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "_Address..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "_Address..."
+msgid "_Assistant's name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "_Assistant's name:"
+msgid "_Birthday:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-msgid "_Birthday:"
+msgid "_Business"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Business"
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+msgid "_Delete"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h: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"
+msgid "_Department:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Department:"
+msgid "_Full Name..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "_Full Name..."
+msgid "_Home"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "_Home"
+msgid "_Job title:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Job title:"
+msgid "_Manager's Name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Manager's Name:"
+msgid "_Mobile"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Mobile"
+msgid "_Nickname:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Nickname:"
+msgid "_Office:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Office:"
+msgid "_Profession:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Profession:"
+msgid "_Spouse:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Spouse:"
+msgid "_This is the mailing address"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "_This is the mailing address"
+msgid "_Web page address:"
 msgstr ""
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr ""
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
+msgid "Afghanistan"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
+msgid "Albania"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
+msgid "Algeria"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
+msgid "American Samoa"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+msgid "Andorra"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
+msgid "Angola"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
+msgid "Anguilla"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
+msgid "Antarctica"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
+msgid "Antigua And Barbuda"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Organisation"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+msgid "Austria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+msgid "Belarus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+msgid "Belize"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+msgid "Benin"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+msgid "Brazil"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
+msgid "Canada"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+msgid "Chad"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
+msgid "Check Address"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Colours"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+msgid "China"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Colours"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+msgid "Congo"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
+msgid "Finland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+msgid "France"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+msgid "Greece"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+msgid "Greenland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+msgid "Grenada"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+msgid "Guam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+msgid "Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+msgid "Haiti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+msgid "Honduras"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+msgid "Hungary"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+msgid "Laos"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+msgid "Lesotho"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+msgid "Liberia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+msgid "Macau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+msgid "Malawi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+msgid "Mali"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+msgid "Malta"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+msgid "Mauritius"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+msgid "Mayotte"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+msgid "Monaco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+msgid "Mozambique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+msgid "Myanmar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+msgid "Nepal"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+msgid "Netherlands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+msgid "New Caledonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+msgid "Niger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+msgid "Nigeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+msgid "Niue"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+msgid "Norway"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+msgid "Pakistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+msgid "Panama"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+msgid "Peru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+msgid "Poland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+msgid "Portugal"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+msgid "Qatar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+msgid "Reunion"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+msgid "Rwanda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+msgid "Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+msgid "Senegal"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+msgid "Seychelles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+msgid "Somalia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+msgid "Spain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+msgid "Sudan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+msgid "Suriname"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+msgid "Swaziland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+msgid "Sweden"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+msgid "Taiwan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+msgid "Tajikistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+msgid "Thailand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+msgid "Togo"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+msgid "Tonga"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+msgid "Turkey"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+msgid "Turkmenistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+msgid "Uganda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+msgid "United States"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+msgid "Viet Nam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+msgid "Yemen"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+msgid "_Address:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+msgid "_City:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+msgid "_PO Box:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+msgid "_State/Province:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_Post Code:"
 
@@ -1052,6 +2009,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr ""
 
@@ -1060,7 +2018,7 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 msgid "Contact List Editor"
 msgstr ""
 
@@ -1069,7 +2027,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1088,25 +2046,30 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
+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
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr ""
 
@@ -1218,42 +2181,50 @@ msgstr ""
 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
-msgid "Send contact to other"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr ""
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr ""
 
@@ -1268,7 +2239,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr ""
 
@@ -1276,7 +2248,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr ""
 
@@ -1293,7 +2265,11 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1317,131 +2293,131 @@ msgid "Error removing list"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr ""
 
@@ -1631,6 +2607,20 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
+#: addressbook/printing/e-contact-print.c:1091
+msgid "Print cards"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+msgid "Print card"
+msgstr ""
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+msgid "Print envelope"
+msgstr ""
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1788,7 +2778,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise Bonobo"
@@ -1797,147 +2787,137 @@ msgstr "Could not initialise Bonobo"
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
+#: calendar/gui/calendar-commands.c:435
+#, c-format
+msgid "%d"
 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"
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%m/%d/%Y"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:586
+#: calendar/gui/calendar-commands.c:604
 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/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr ""
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr ""
 
-#: 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"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
-#: calendar/gui/e-calendar-table.c:383
-msgid "Transparent"
+#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+msgid "Free"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
-#: calendar/gui/e-calendar-table.c:382
-msgid "Opaque"
+#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1945,69 +2925,56 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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 ""
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr ""
 
@@ -2027,27 +2994,80 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:57
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56
+msgid "Folder containing to-do items"
+msgstr ""
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr ""
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr ""
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr ""
+
+#: calendar/gui/component-factory.c:409
+msgid "New _Task"
+msgstr ""
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2095,109 +3115,115 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:409
 msgid "before start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 msgid "after start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 msgid "before end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -2205,12 +3231,11 @@ msgstr ""
 msgid "_Options..."
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr ""
 
@@ -2227,7 +3252,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr ""
 
@@ -2244,194 +3269,197 @@ msgid "10 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
+msgid "15 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
+msgid "30 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
+msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
+msgid "Calendar and Tasks Settings"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
+msgid "Color for overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr ""
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-msgid "Calendar"
+msgid "Create new appointments with a default _reminder"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
+msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
+msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#, fuzzy
-msgid "Color for tasks due today"
-msgstr "Colours for display"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
-msgid "Colors for Tasks"
-msgstr "Colours for display"
+msgid "Hours"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
+msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
+msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
+msgid "Show appointment _end times in week and month views"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
+msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
+msgid "Sta_rt of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
+msgid "Su_n"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
+msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
+msgid "T_ue"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
+msgid "Time"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Time _zone:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
+msgid "Time di_visions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Show appointment end times in week and month views"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
+#: ui/evolution-calendar.xml.h:33
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
+msgid "_12 hour (AM/PM)"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
+msgid "_24 hour"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Task List"
+msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
+msgid "_Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
+msgid "_End of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Time"
+msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
+msgid "_General"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
+msgid "_Hide completed tasks after"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Time zone:"
+msgid "_Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
+msgid "_Other"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
+msgid "_Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
+msgid "_Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
+msgid "_Wed"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Work Week"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
+msgid "before the start of the appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/cancel-comp.c:52
@@ -2494,72 +3522,67 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2605,39 +3628,32 @@ msgstr ""
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr ""
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+msgid "Addressbook..."
 msgstr ""
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+msgid "Delegate To:"
 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."
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr ""
 
@@ -2645,162 +3661,174 @@ msgstr ""
 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"
+#: calendar/gui/dialogs/event-page.glade.h:2
+msgid "B_usy"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Date & Time"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
-msgid "Pri_vate"
+msgid "Con_fidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
-msgid "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Date & Time"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
-msgid "Su_mmary:"
+msgid "F_ree"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
+#: calendar/gui/dialogs/task-page.glade.h:5
+msgid "Pri_vate"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
+msgid "Pu_blic"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "_End time:"
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Show Time As"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
+msgid "Su_mmary:"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:13
+msgid "_End time:"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:644
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "In Process"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 msgid "Sent By:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 msgid "_Delegate To..."
 msgstr ""
 
@@ -2837,19 +3865,18 @@ msgid "Role"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
 msgid "Organizer:"
@@ -2894,12 +3921,12 @@ msgstr ""
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
@@ -2911,25 +3938,29 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
+msgid "_Custom recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr ""
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "_No recurrence"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Simple recurrence"
+msgstr ""
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -2971,157 +4002,154 @@ 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
-msgid "Delegated From:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Delegated To:"
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-msgid "No one"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:16
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:21
-msgid "_Due Date:"
+#: calendar/gui/dialogs/task-page.glade.h:7
+msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 msgid "_Delete this Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#: calendar/gui/e-calendar-table.c:1130
+msgid "Click to add a task"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:3
@@ -3157,20 +4185,20 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-msgid "Summary"
-msgstr ""
-
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:15
-msgid "Task sort"
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
+msgid "Summary"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Transparency"
+msgid "Task sort"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:18
@@ -3184,144 +4212,236 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3306
-msgid "New _Appointment"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618
+msgid "Meeting Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:623
+msgid "Meeting Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:628
+msgid "Meeting Update"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:637
+#, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:638
+msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
-msgid "This is a meeting request."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:643
+msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:648
+msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: 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."
+#: calendar/gui/e-itip-control.c:666
+msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:676
+msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:691
+msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:696
+msgid "Bad Task Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:713
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:714
+msgid "Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Bad Free/Busy Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+msgid "Update complete\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:969
+msgid "Removal Complete"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+msgid "Item sent!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3359,43 +4479,26 @@ msgstr ""
 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
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, 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/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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3421,42 +4524,42 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "January"
+msgid "Go To Today"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "July"
+msgid "January"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "June"
+msgid "July"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "March"
+msgid "June"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "May"
+msgid "March"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "November"
+msgid "May"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "October"
+msgid "November"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:13
-msgid "September"
+msgid "October"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
+msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3612,12 +4715,6 @@ msgstr ""
 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:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3651,9 +4748,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr ""
 
@@ -3665,7 +4761,7 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3701,6 +4797,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 ""
@@ -3759,6 +4951,7 @@ msgid "Unable to process spool folder"
 msgstr ""
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
@@ -3796,7 +4989,7 @@ msgstr ""
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3819,12 +5012,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -3938,13 +5131,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -3962,15 +5155,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4004,7 +5197,7 @@ msgid "Connection cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4015,7 +5208,7 @@ msgstr ""
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
@@ -4132,42 +5325,68 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr ""
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+msgid "POP Source URI"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4180,12 +5399,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4229,7 +5448,7 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4237,7 +5456,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4278,60 +5497,60 @@ msgstr ""
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 msgid "Scanning for new messages"
 msgstr ""
 
@@ -4344,7 +5563,7 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr ""
 
@@ -4352,7 +5571,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr ""
 
@@ -4390,7 +5609,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
@@ -4401,7 +5620,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -4413,12 +5632,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4508,7 +5727,7 @@ msgstr ""
 #: 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-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4520,7 +5739,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4587,20 +5806,20 @@ msgstr ""
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: 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:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: 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-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4610,12 +5829,12 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
@@ -4658,13 +5877,13 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing folder"
 msgstr "Synchronising \"%s\""
 
 #: 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"
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4674,25 +5893,22 @@ 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"
+msgid "Cannot summarize folder: %s: %s"
 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:1516
+#: camel/providers/local/camel-spool-summary.c:931
 #, fuzzy
-msgid "Synchronising folder"
+msgid "Synchronizing folder"
 msgstr "Synchronising \"%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"
+msgid "Could not open folder to summarize: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -4795,6 +6011,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -4883,37 +6110,37 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
-msgid "No message with uid %s"
+msgid "Could not fetch message: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:296
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
-msgid "Retrieving POP message %d"
+msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
-msgid "Could not fetch message: %s"
+msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
-msgid "Could not retrieve message from POP server %s: %s"
+msgid "Retrieving POP message %d"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-provider.c:37
@@ -4929,7 +6156,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr ""
 
@@ -5008,7 +6235,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr ""
 
@@ -5060,7 +6287,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
@@ -5068,122 +6295,122 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5191,125 +6418,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
+#: camel/providers/smtp/camel-smtp-transport.c:760
+msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
-msgid "SMTP Authentication"
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5339,7 +6566,7 @@ msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr ""
 
@@ -5372,52 +6599,52 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5442,95 +6669,95 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr ""
 
@@ -5557,55 +6784,93 @@ msgstr ""
 msgid "calendar information"
 msgstr ""
 
+#: default_user/searches.xml.h:1
+msgid "Body contains"
+msgstr ""
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr ""
+
+#: default_user/searches.xml.h:3
+msgid "Body or subject contains"
+msgstr ""
+
+#: default_user/searches.xml.h:4
+msgid "Message contains"
+msgstr ""
+
+#: default_user/searches.xml.h:5
+msgid "Recipients contain"
+msgstr ""
+
+#: default_user/searches.xml.h:6
+msgid "Sender contains"
+msgstr ""
+
+#: default_user/searches.xml.h:7
+msgid "Subject contains"
+msgstr ""
+
+#: default_user/searches.xml.h:8
+msgid "Subject does not contain"
+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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr ""
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr ""
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5613,13 +6878,13 @@ 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
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -5709,7 +6974,7 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr ""
 
@@ -5721,11 +6986,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr ""
 
@@ -5744,20 +7013,20 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5776,62 +7045,51 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr ""
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr ""
 
@@ -5855,190 +7113,191 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
+#: filter/libfilter-i18n.h:5
+msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
+#: filter/libfilter-i18n.h:6
+msgid "Date received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:7
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date received"
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:10
-msgid "Date sent"
+msgid "Do Not Exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:11
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Deleted"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "does not sound like"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "does not start with"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Do Not Exist"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Draft"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "ends with"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Exist"
+msgid "Read"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "exists"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Expression"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Important"
+msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "is less than"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is not"
+msgid "Size (kB)"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Mailing list"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "Message Header"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "Move to Folder"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: mail/message-list.etspec.h:9
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "on or before"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Read"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Recipients"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "Regex Match"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Replied to"
+msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
-msgid "Score"
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
-msgid "Sender"
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "Set Status"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "Size (kB)"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "Source Account"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "starts with"
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:50
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
-#: mail/message-list.etspec.h:9
-msgid "Subject"
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
@@ -6070,14 +7329,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr ""
 
@@ -6101,11 +7359,11 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6164,163 +7422,178 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+msgid "Folder containing mail"
+msgstr ""
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr ""
 
 #: mail/component-factory.c:757
+msgid "New Mail Message"
+msgstr ""
+
+#: mail/component-factory.c:757
+msgid "New _Mail Message"
+msgstr ""
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:893
-msgid "Store search as vFolder"
+#: mail/folder-browser.c:909
+msgid "Create vFolder from Search"
 msgstr ""
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 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
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-info.c:64
+msgid "Getting Folder Information"
+msgstr ""
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6379,52 +7652,56 @@ msgid "Evolution News Editor"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 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
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr ""
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 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"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+msgid "Mail Settings"
 msgstr ""
 
 #: mail/mail-autofilter.c:70
@@ -6471,17 +7748,17 @@ msgid ""
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6489,195 +7766,222 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 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:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr ""
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+msgid "Do not ask me again."
+msgstr ""
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
-msgid "Connecting to server..."
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, c-format
+msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
-msgid " Check for supported types "
+#: mail/mail-config.c:1809
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6687,282 +7991,341 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
+#: mail/mail-config.glade.h:30
+msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
+#: mail/mail-config.glade.h:31
+msgid "Each account must have a different name."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr ""
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
-msgid "HTML Signature:"
+#: mail/mail-config.glade.h:35
+msgid "HTML signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr ""
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config.glade.h:54
-msgid "Mark messages as Read after"
+#: mail/mail-config.glade.h:44
+msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
-msgid "Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Prompt when sending messages with an empty subject"
+#: mail/mail-config.glade.h:57
+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"
+#: mail/mail-config.glade.h:58
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:68
+msgid "Select Filter Log file..."
 msgstr ""
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
+#: mail/mail-config.glade.h:69
+msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+msgid "Server requires _authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
+#: mail/mail-config.glade.h:86
+msgid "Use secure connection (_SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:87
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+msgid "_Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+msgid "_Check for supported types"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
+msgid "_Email Address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+msgid "_Full Name:"
+msgstr ""
+
+#: mail/mail-config.glade.h:99
+msgid "_HTML Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:100
+msgid "_Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+msgid "_Host:"
+msgstr ""
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
 #: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+msgid "_Log filter actions to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Username:"
+msgid "_Mark messages as Read after"
 msgstr ""
 
 #: mail/mail-config.glade.h:105
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
+msgid "_Name:"
+msgstr ""
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Organisation:"
+
+#: mail/mail-config.glade.h:108
+msgid "_PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "_Path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+msgid "_Remember this password"
 msgstr ""
 
 #: mail/mail-config.glade.h:112
-msgid "newswindow1"
+msgid "_Send mail in HTML format by default."
 msgstr ""
 
 #: mail/mail-config.glade.h:113
-msgid "placeholder"
+msgid "_Signature file:"
 msgstr ""
 
 #: mail/mail-config.glade.h:114
+msgid "_Username:"
+msgstr ""
+
+#: mail/mail-config.glade.h:116
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:117
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr ""
 
@@ -7002,194 +8365,205 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, c-format
+msgid "%d selected"
+msgstr ""
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-local.c:460
 #, c-format
-msgid "Opening '%s'"
+msgid "Registering '%s'"
 msgstr ""
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, 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
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr ""
@@ -7208,200 +8582,220 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:227
+msgid "Fetching Mail"
+msgstr ""
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr ""
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synchronise \"%s\""
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr ""
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr ""
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 msgid "Untitled Message"
 msgstr ""
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 msgid "Empty Message"
 msgstr ""
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr ""
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr ""
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr ""
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr ""
 
@@ -7419,80 +8813,85 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+msgid "(No subject)"
+msgstr ""
+
+#: mail/message-browser.c:127
+#, c-format
+msgid "%s - Message"
+msgstr ""
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2290
-msgid "Updating message list"
+#: mail/message-list.c:2312
+msgid "Generating message list"
 msgstr ""
 
 #: mail/message-list.etspec.h:2
@@ -7507,38 +8906,72 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: 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:"
+#: mail/subscribe-dialog.c:174
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, c-format
-msgid "Getting store for \"%s\""
+msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr ""
+
+#: mail/subscribe-dialog.c:1490
+msgid "No server has been selected"
+msgstr ""
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+msgid " _Refresh List "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Synchronising \"%s\""
+
+#: mail/subscribe-dialog.glade.h:3
+msgid "Display options"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr ""
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+msgid "_Subscribe"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:8
+msgid "_Unsubscribe"
+msgstr ""
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
 msgid "Evolution component for the executive summary."
@@ -7549,49 +8982,66 @@ msgstr "Cannot initialise Evolution's mail summary component."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 #, 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
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 msgid "No appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 msgid "%l:%M%p"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 msgid "%a %l:%M%p"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
-msgid "My Evolution Settings"
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1421
+msgid "Summary Settings"
 msgstr ""
 
 #: my-evolution/e-summary-rdf.c:281
@@ -7602,7 +9052,11 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+msgid "News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr ""
 
@@ -7610,24 +9064,28 @@ msgstr ""
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+msgid "Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr ""
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %Y"
 msgstr ""
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
+msgid "Print Summary"
 msgstr ""
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr ""
 
 #: my-evolution/main.c:52
@@ -7635,6 +9093,38 @@ msgstr ""
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Could not initialise Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr ""
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr ""
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr ""
@@ -8786,107 +10276,121 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid "Add new feed"
+msgid " _Remove"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "All folders:"
+msgid "Add n_ew feed"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
+msgid "Al_l stations:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
-msgid "All stations:"
-msgstr ""
+#, fuzzy
+msgid "All _folders:"
+msgstr "Synchronising \"%s\""
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "Display folders:"
+#: my-evolution/my-evolution.glade.h:5
+msgid "All news _feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:7
-msgid "Display stations:"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "Displayed feeds:"
+msgid "Ma_x number of items shown:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-msgid "Five days"
+msgid "News Feed Settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
+msgid "One mont_h"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "One w_eek"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
+msgid "Show _all tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
+msgid "Show _today's tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:15
-msgid "One day"
+msgid "Tasks "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:16
-msgid "One month"
+msgid "Units: "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "One week"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
+msgid "Weather settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Schedule"
-msgstr ""
+#, fuzzy
+msgid "_Display folders:"
+msgstr "Synchronising \"%s\""
 
 #: my-evolution/my-evolution.glade.h:20
-msgid "Show all tasks"
+msgid "_Display stations:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
+msgid "_Displayed feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "Show today's tasks"
+msgid "_Five days"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:23
-msgid "Tasks "
+msgid "_Mail"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
+msgid "_News Feeds"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "Weather"
+msgid "_One day"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "Weather settings"
+msgid "_Refresh time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "imperial"
+msgid "_Schedule"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+msgid "_Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:29
+msgid "_Weather"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "_imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -8902,7 +10406,15 @@ msgstr ""
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-local-storage.c:178
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr ""
 
@@ -8947,7 +10459,7 @@ msgid ""
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -8955,7 +10467,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -8964,7 +10476,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -8972,52 +10484,72 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr ""
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+msgid "Rename"
+msgstr ""
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr ""
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9029,7 +10561,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -9039,11 +10571,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr ""
 
@@ -9073,7 +10605,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9116,7 +10648,7 @@ msgstr ""
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr ""
 
@@ -9124,284 +10656,309 @@ msgstr ""
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Cannot initialise Evolution's mail storage hash."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 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:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 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 "Cannot initialise the Evolution shell."
-
-#: shell/e-shell-view.c:1411
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1311
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:1644
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:1646
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 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
+#: shell/e-shortcuts-view.c:383
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr ""
 
-#: 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:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr ""
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+msgid "The specified folder cannot be modified or removed"
+msgstr ""
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
@@ -9421,10 +10978,6 @@ msgstr ""
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr ""
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr ""
@@ -9438,17 +10991,25 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr ""
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+msgid "Evolution Importer Assistant"
+msgstr ""
+
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+msgid "Select a File (step 1 of 2)"
 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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -9465,10 +11026,10 @@ msgid "Don't ask me again"
 msgstr ""
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9485,31 +11046,36 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr ""
 
@@ -9525,11 +11091,11 @@ msgstr ""
 msgid "Create new contact list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr ""
 
@@ -9537,73 +11103,109 @@ msgstr ""
 msgid "Delete selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+msgid "New List"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+msgid "Save selected contacts as a VCard."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:24
+msgid "Send a mess to the selected contacts."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:26
+msgid "Send selected contacts to another person."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:24
-msgid "_Contact Group"
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+msgid "_Forward Contact..."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+msgid "_Save as VCard"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr ""
 
@@ -9612,107 +11214,115 @@ 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 _Task"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
-msgid "Go To"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+msgid "Day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
+msgid "Delete the appointment"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+msgid "Go To"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
+msgid "Go back"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
+msgid "Go forward"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+msgid "Go to _Date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
+msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
+#: ui/evolution-calendar.xml.h:19
+msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:20
+msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
+#: ui/evolution-calendar.xml.h:21
+msgid "New Appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Publish Free/Busy information for this calendar"
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+msgid "Print this calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
+msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
+msgid "Show one day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:29
-msgid "_Appointment..."
+msgid "Show one month"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:30
-msgid "_Calendar Settings..."
+msgid "Show one week"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:31
+msgid "Show the working week"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:32
-msgid "_Day"
+msgid "Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
+#: ui/evolution-calendar.xml.h:35
+msgid "_Appointment..."
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:36
+msgid "_Calendar Settings..."
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:41
+msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
+#: ui/evolution-calendar.xml.h:42
+msgid "_Task..."
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
@@ -9725,15 +11335,16 @@ msgid "Close"
 msgstr "Colours"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr ""
+#, fuzzy
+msgid "Close this item"
+msgstr "Colours"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr ""
 
@@ -9741,111 +11352,80 @@ msgstr ""
 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
-msgid "Print S_etup"
-msgstr ""
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: 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"
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:17
-msgid "Save this item to disk"
+#: ui/evolution-comp-editor.xml.h:14
+msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:19
-msgid "_Action"
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save this item to disk"
 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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 ""
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr ""
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:6
-msgid "Save the list and close the dialog box"
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
 msgstr ""
 
 #: ui/evolution-contact-list-editor.xml.h:7
-msgid "Se_nd list to other..."
+msgid "Save the list and close the dialog box"
 msgstr ""
 
 #: ui/evolution-contact-list-editor.xml.h:8
+msgid "Se_nd list to other..."
+msgstr ""
+
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr ""
 
@@ -9853,19 +11433,19 @@ msgstr ""
 msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -9877,15 +11457,10 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-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 ""
-
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customise My Evolution"
 msgstr ""
@@ -9899,67 +11474,62 @@ msgid "Cancel the current mail operation"
 msgstr ""
 
 #: 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-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
+#: ui/evolution-mail-global.xml.h:10
+msgid "New Message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
@@ -9983,88 +11553,96 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr ""
 
+#: ui/evolution-mail-global.xml.h:24
+msgid "_Subscribe to Folders..."
+msgstr ""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+msgid "Cu_t"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Sh_ow Hidden Messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr ""
 
@@ -10072,7 +11650,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr ""
 
@@ -10080,11 +11658,11 @@ msgstr ""
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
 msgstr ""
 
@@ -10297,7 +11875,7 @@ 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"
+msgid "Preview the message to be printed"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10316,36 +11894,32 @@ msgstr ""
 msgid "Previous Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
+msgid "Print this message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:66
-msgid "Print this message"
+msgid "Reply"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:67
-msgid "Reply"
+msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
-msgid "Reply to All"
+#: ui/evolution-mail-message.xml.h:70
+msgid "S_earch Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "S_earch Message"
+msgid "Save the message as a text file"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:72
-msgid "Save the message as a text file"
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:73
-msgid "Search for text in the body of the displayed message"
+msgid "Setup the page settings for your current printer"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:74
@@ -10388,68 +11962,52 @@ msgstr ""
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Re-send Message"
-msgstr ""
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr ""
 
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Close"
 msgstr "Colours"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr ""
 
@@ -10513,11 +12071,6 @@ 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 ""
@@ -10645,7 +12198,7 @@ msgstr ""
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr ""
 
@@ -10678,14 +12231,26 @@ msgid "Unsubscribe"
 msgstr ""
 
 #: ui/evolution-task-editor.xml.h:1
-msgid "Cancel Task"
+msgid "Assign Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
 msgstr ""
 
 #: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
+msgid "Cancel Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:4
+msgid "Cancel this task"
 msgstr ""
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr ""
 
@@ -10693,39 +12258,27 @@ msgstr ""
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr ""
-
 #: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
+msgid "Copy selected task"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:7
-msgid "Delete selected tasks"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
+msgid "Cut selected task"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:9
-msgid "Paste task from the clipboard"
+msgid "Delete selected tasks"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
+msgid "Paste task from the clipboard"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr ""
 
@@ -10758,172 +12311,148 @@ msgstr ""
 msgid "Create a new folder"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr ""
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr ""
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr ""
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr ""
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr ""
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr ""
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
-msgstr ""
-
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr ""
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
+#: ui/evolution.xml.h:42
+msgid "_Import File..."
 msgstr ""
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr ""
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr ""
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr ""
 
 #: ui/my-evolution.xml.h:4
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr ""
+
+#: ui/my-evolution.xml.h:5
+msgid "Reload"
+msgstr ""
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+msgid "_Summary Settings..."
 msgstr ""
 
 #: views/addressbook/galview.xml.h:1
@@ -10958,6 +12487,25 @@ msgstr ""
 msgid "With Category"
 msgstr ""
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr ""
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr ""
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr ""
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -10965,10 +12513,6 @@ msgstr ""
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr ""
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
@@ -11041,7 +12585,7 @@ msgstr ""
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11051,19 +12595,20 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
-msgid "Now"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
-msgid "Today"
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -11146,34 +12691,31 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
+#: widgets/misc/e-filter-bar.h:94
+msgid "Add to Saved Searches"
 msgstr ""
 
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Colours"
+
 #: 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 ""
@@ -11191,10 +12733,14 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr ""
 
+#: widgets/misc/e-search-bar.c:460
+msgid "Find Now"
+msgstr ""
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr ""
@@ -11218,7 +12764,16 @@ msgstr "Could not initialise Bonobo"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#~ msgid "Colors"
+#, fuzzy
+#~ msgid "Colors for Tasks"
+#~ msgstr "Colours for display"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Cannot initialise the Evolution shell."
+
+#, fuzzy
+#~ msgid "Compose"
 #~ msgstr "Colours"
 
 #, fuzzy
@@ -11234,10 +12789,6 @@ msgstr "Could not initialise Bonobo"
 #~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid "Close %s"
-#~ msgstr "Colours"
-
-#, fuzzy
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -11274,22 +12825,16 @@ msgstr "Could not initialise Bonobo"
 #~ "Rev\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 ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organisation, 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 organisation, and the name of a "
+#~ "file to read your signature from."
 
 #~ msgid "Querying authorization capabilities of \"%s\""
 #~ msgstr "Querying authorisation capabilities of \"%s\""
 
 #~ msgid "Query authorization at \"%s\""
 #~ msgstr "Query authorisation at \"%s\""
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Synchronise \"%s\""
-
-#~ 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 385da33848..784260b93c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,10 +3,11 @@
 # HИctor GarcМa аlvarez <hector@scouts-es.org>, 2000-2001.
 # Carlos PerellС MarМn <carlos@gnome-db.org>, 2000-2001.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2001-08-12 01:33+0200\n"
+"POT-Creation-Date: 2001-08-22 18:50-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 +23,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:3624
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Tarjeta: "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -34,7 +35,7 @@ msgstr ""
 "\n"
 "Nombre:"
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -42,7 +43,7 @@ msgstr ""
 "\n"
 "  Prefijo:    "
 
-#: addressbook/backend/ebook/e-card.c:3628
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -50,7 +51,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -58,7 +59,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -66,7 +67,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -74,7 +75,7 @@ msgstr ""
 "\n"
 "  Sufijo:     "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -82,7 +83,7 @@ msgstr ""
 "\n"
 "Fecha de nacimiento: "
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -90,7 +91,7 @@ msgstr ""
 "\n"
 "DirecciСn:"
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -98,7 +99,7 @@ msgstr ""
 "\n"
 "  DirecciСn postal: "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -106,7 +107,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -114,7 +115,7 @@ msgstr ""
 "\n"
 "  Calle:       "
 
-#: addressbook/backend/ebook/e-card.c:3661
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -122,7 +123,7 @@ msgstr ""
 "\n"
 "  Ciudad:      "
 
-#: addressbook/backend/ebook/e-card.c:3662
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -130,7 +131,7 @@ msgstr ""
 "\n"
 "  RegiСn:      "
 
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -138,7 +139,7 @@ msgstr ""
 "\n"
 "  CСdigo postal: "
 
-#: addressbook/backend/ebook/e-card.c:3664
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -146,7 +147,7 @@ msgstr ""
 "\n"
 "  PaМs:        "
 
-#: addressbook/backend/ebook/e-card.c:3677
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -154,7 +155,7 @@ msgstr ""
 "\n"
 "Etiqueta de envМo: "
 
-#: addressbook/backend/ebook/e-card.c:3689
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -162,7 +163,7 @@ msgstr ""
 "\n"
 "TelИfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -170,7 +171,7 @@ msgstr ""
 "\n"
 "TelИfono:"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -178,7 +179,7 @@ msgstr ""
 "\n"
 "Correo electrСnico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -186,7 +187,7 @@ msgstr ""
 "\n"
 "Correo electrСnico:"
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -194,7 +195,7 @@ msgstr ""
 "\n"
 "Programa de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -202,7 +203,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -210,7 +211,7 @@ msgstr ""
 "\n"
 "LocalizaciСn geogrАfica: "
 
-#: addressbook/backend/ebook/e-card.c:3756
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -218,7 +219,7 @@ msgstr ""
 "\n"
 "Cargo: "
 
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -226,7 +227,7 @@ msgstr ""
 "\n"
 "OrganizaciСn: "
 
-#: addressbook/backend/ebook/e-card.c:3769
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -234,7 +235,7 @@ msgstr ""
 "\n"
 "  Nombre: "
 
-#: addressbook/backend/ebook/e-card.c:3770
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -242,7 +243,7 @@ msgstr ""
 "\n"
 "  Unidad: "
 
-#: addressbook/backend/ebook/e-card.c:3771
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -250,7 +251,7 @@ msgstr ""
 "\n"
 "  Unidad2: "
 
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -258,7 +259,7 @@ msgstr ""
 "\n"
 "  Unidad3: "
 
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -266,7 +267,7 @@ msgstr ""
 "\n"
 "  Unidad4: "
 
-#: addressbook/backend/ebook/e-card.c:3777
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -274,7 +275,7 @@ msgstr ""
 "\n"
 "categorМas: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -292,7 +293,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3791
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -300,7 +301,7 @@ msgstr ""
 "\n"
 "Cadena Зnica: "
 
-#: addressbook/backend/ebook/e-card.c:3794
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -308,11 +309,11 @@ msgstr ""
 "\n"
 "Llave pЗblica: "
 
-#: addressbook/backend/ebook/e-card.c:4066
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "VCards MЗltiples"
 
-#: addressbook/backend/ebook/e-card.c:4074
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -321,7 +322,7 @@ msgstr "VCard para %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/conduit/address-conduit.c:1100
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
@@ -337,20 +338,20 @@ msgstr "No pude cargar el cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook no esta cargado\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "No pude leer informaciСn de la aplicaciСn de direcciones del pilot"
 
@@ -398,6 +399,41 @@ msgstr "FactorМa para el componente de agenda de Evolution."
 msgid "Factory for the sample Addressbook control"
 msgstr "FactorМa para el control de ejemplo de la Agenda"
 
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Error cargando la informaciСn del filtro:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Nuevo contacto:"
+
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Nuevo contacto:"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Lista de _contactos"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Lista de _contactos"
+
 #: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
 msgstr "Editar agenda de direcciones"
@@ -415,52 +451,56 @@ msgid "Add Addressbook"
 msgstr "AЯadir agenda de direcciones"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Fuentes de la agenda de direcciones"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
 msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:7
 #: calendar/gui/dialogs/task-editor.c:151
 msgid "Basic"
 msgstr "BАsico"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:8
 msgid "De_lete"
 msgstr "Bo_rrar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.glade.h:9
 msgid "One"
 msgstr "Uno"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:10
 msgid "Search _base:"
 msgstr "Base de _bЗsqueda:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "Search s_cope: "
 msgstr "Rango de bЗ_squeda: "
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Server Name"
 msgstr "Nombre del servidor"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/addressbook-config.glade.h:13
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "The information below is required in order to add an addressbook.  "
 msgstr "Se requiere la informaciСn de debajo para aЯadir una agenda.  "
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "This information is not required for most ldap servers. "
 msgstr ""
 "Esta informaciСn no es requerida por la mayorМa de los servidores ldap."
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
@@ -469,7 +509,7 @@ msgstr ""
 "usados en una bЗsqueda. Para mАs informaciСn contacte con el administrador "
 "del servidor."
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:17
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
@@ -477,15 +517,15 @@ msgstr ""
 "Este es el nodo base de todas sus bЗsquedas en el servidor ldap. Para mАs "
 "informaciСn contacte con el administrador del servidor."
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/addressbook-config.glade.h:18
 msgid "This is the name of the server where your addressbook is located."
 msgstr "Este es el nombre sel servidor donde estА su agenda."
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/addressbook-config.glade.h:19
 msgid "This is the port that your ldap server uses."
 msgstr "Este es el puerto que usa su servidor ldap."
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.glade.h:20
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
@@ -493,65 +533,66 @@ msgstr ""
 "Este nombre serА usado para identificar su cuenta, Es solo para poder "
 "mostrarlo en pantalla."
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "_Account name:"
 msgstr "Nombre de la cuent_a:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:88
-#: my-evolution/my-evolution.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_AЯadir"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-#: mail/mail-config.glade.h:93 ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
+#: addressbook/gui/component/addressbook-config.glade.h:24
 msgid "_My server requires authentication"
 msgstr "_Mi servidor requiere autenticaciСn"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:25
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/addressbook-config.glade.h:26
 msgid "_Server name:"
 msgstr "Nombre del _servidor:"
 
-#: addressbook/gui/component/addressbook-storage.c:135
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "Otros contactos"
 
-#: addressbook/gui/component/addressbook.c:372
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr ""
 "Por favor introduzca su direcciСn correo y su contraseЯa para acceder a %s"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:394
 msgid "LDAP Authentication"
 msgstr "AutenticaciСn LDAP"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:405
 msgid "Email Address:"
 msgstr "DirecciСn de correo:"
 
-#: addressbook/gui/component/addressbook.c:404
+#: addressbook/gui/component/addressbook.c:418
 msgid "Password:"
 msgstr "Clave:"
 
-#: addressbook/gui/component/addressbook.c:467
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:474
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -561,7 +602,7 @@ msgstr ""
 "que ha introducido una URI erronea, o que el servidor LDAP estА\n"
 "caido"
 
-#: addressbook/gui/component/addressbook.c:479
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -573,7 +614,7 @@ msgstr ""
 "de las fuentes del CVS una vez que haya obtenido LDAP del\n"
 "siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -581,30 +622,38 @@ 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:638
-#: calendar/gui/cal-search-bar.c:54
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:639
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: addressbook/gui/component/addressbook.c:640
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "El mensaje contiene"
 
-#: addressbook/gui/component/addressbook.c:641
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "CategorМa es"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:642 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:834
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "CategorМas:"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrarА el visor de carpetas"
 
@@ -619,19 +668,19 @@ msgstr "(nada)"
 
 #: 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:1581
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "Correo electrСnico principal"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1582
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "Correo electrСnico 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1583
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "Correo electrСnico 3"
 
@@ -653,19 +702,19 @@ msgstr "AЯadir direcciСn al contacto existente ╚%s╩"
 msgid "Querying Addressbook..."
 msgstr "Consultando la Agenda de Direcciones..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Editar informaciСn de contacto"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "AЯadir a Contactos"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "Fusionar DirecciСnes de Correo"
 
@@ -686,10 +735,10 @@ 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:640
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Quitar"
 
@@ -705,12 +754,12 @@ msgstr "©Enviar correo en HTML?"
 msgid "Unnamed Contact"
 msgstr "Contactos sin nombre"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 "No fue posible obtener el almacen local.  Esto no deberМa ocurrir nunca."
 
-#: addressbook/gui/component/select-names/e-select-names.c:484
+#: addressbook/gui/component/select-names/e-select-names.c:560
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionas contactos de la agenda"
 
@@ -774,11 +823,11 @@ msgid "Details"
 msgstr "Detalles"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Archivar como:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "General"
 msgstr "General"
 
@@ -802,180 +851,187 @@ msgstr "Tipos de telИfono"
 msgid "Wants to receive _HTML mail"
 msgstr "Prefiere recibir el correo como _HTML"
 
-#: 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-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_DirecciСn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "Nombre del _asistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "Fecha de _nacimiento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Trabajo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contactos..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1472 mail/folder-browser.c:1313
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:88
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Nombre completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Casa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_Puesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Nombre del _manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_MСvil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "Nick:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_ProfesiСn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_CСnyuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "Es_tА es la direcciСn de correo"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "DirecciСn de la pАgina web:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "©Borrar contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto estА en estas categorМas:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1539
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1540
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1541
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Trabajo 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1542
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1543
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Rellamada"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1544
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Coche"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1545
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "CompaЯМa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1546
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1547
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1548
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1549
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1550
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "MСvil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1552
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1553
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Papel"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1554
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1555
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1556
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "No pude borrar el resumen la carpeta `%s': %s"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "AЯadir Contacto"
@@ -985,7 +1041,7 @@ msgid "Edit Full"
 msgstr "Editar Todo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Nombre Completo"
 
@@ -1007,42 +1063,1035 @@ msgid "Address _2:"
 msgstr "DirecciСn _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Asistente"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "AutomАtico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "OrientaciСn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "Agosto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "aЯos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "TamaЯo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Enviando"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Granizo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "CanadА"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Silla"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Comprobar DirecciСn"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Archivo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Chino"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Nuevo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Copiando"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "P_aМs:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Cancelar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "Griego"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "General"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Esperando"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "horas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Domingo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+#, fuzzy
+msgid "India"
+msgstr "Individual"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#, fuzzy
+msgid "Ireland"
+msgstr "Coreano"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+#, fuzzy
+msgid "Japan"
+msgstr "Japones"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#, fuzzy
+msgid "Jordan"
+msgstr "Coreano"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "La mАs baja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "La mАs baja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "_anglosajСn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#, fuzzy
+msgid "Lithuania"
+msgstr "Ligera granizada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Marzo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Correo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Correo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Correo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Margenes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Mayo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Lunes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "MСvil"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Encargado"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Responder"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Siguiente hilo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Nuevo contacto:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "MАs alta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "_anglosajСn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minuto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Ahora"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Pegar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#, fuzzy
+msgid "Pitcairn"
+msgstr "Imprimir tarjeta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Vertical"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "despuИs de"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Regiones"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Humo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "General"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "_Horario"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Arena"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Dom"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Nick"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Visto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Lluvia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Lista de Tareas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "A"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Hoy"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Mar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Turco"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ucraniano"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Mensaje sin tМtulo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "_Seleccionar nombres"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#, fuzzy
+msgid "Western Sahara"
+msgstr "Europeo Occidental"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Visto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_DirecciСn:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Ciudad:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_DirecciСn:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "CСdigo _Postal"
 
@@ -1131,7 +2180,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar direcciСnes al mandar correo a esta lista"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "_Quitar"
 
@@ -1149,7 +2198,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:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr "Detectado un Contacto Duplicado"
 
@@ -1170,14 +2219,19 @@ msgstr ""
 "en esta carpeta.  ©Quiere aЯadirlo de todos modos?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+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:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "Contactos Conflictivos:"
 
-#: 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:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1185,17 +2239,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
-msgid "_Change Anyway"
-msgstr "_Cambiar de todos modos"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:242
+#: widgets/misc/e-filter-bar.c:243
 msgid "Advanced Search"
 msgstr "BЗqueda avanzada"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:258
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Buscar"
 
@@ -1309,10 +2359,10 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:1286
-#: ui/evolution-addressbook.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Guardar como vCard"
 
@@ -1322,38 +2372,38 @@ msgid "Open"
 msgstr "Abrir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send contact to other"
-msgstr "Enviar el contacto a otro"
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Reenviar _Adjunto"
 
 #
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:674
-#: ui/evolution-addressbook.xml.h:26
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "Enviar un mensaje al contacto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:675
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:267
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Borrar"
 
@@ -1368,8 +2418,8 @@ msgid "Success"
 msgstr "Exito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1619
-#: shell/e-storage.c:501
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -1377,7 +2427,7 @@ msgstr "Error desconocido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -1394,8 +2444,12 @@ msgid "Protocol not supported"
 msgstr "Protocolo no soportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-msgid "Canceled"
-msgstr "Cancelado"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
+msgstr "Cancelar"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Other error"
@@ -1418,131 +2472,131 @@ msgid "Error removing list"
 msgstr "Error eliminando lista"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1159
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aquМ para aЯadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Archivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "Correo electrСnico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "TelИfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "TelИfono del Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "TelИfono del Trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "TelИfono para rellamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "TelИfono de la compaЯМa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "TelИfono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "OrganizaciСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "DirecciСn del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "DirecciСn de su casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "TelИfono mСvil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "TelИfono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "TelИfono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "TelИfono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Otro telИfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Otra direcciСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "TМtulo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "ProfesiСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Encargado"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Nick"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:811
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "CСnyuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:812
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "URL de disponibilidad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1156
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "Hecho."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1188
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr "Eliminando tarjetas..."
 
@@ -1745,8 +2799,8 @@ msgstr "Imprimir tarjetas"
 msgid "Print card"
 msgstr "Imprimir tarjeta"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
@@ -1910,42 +2964,42 @@ 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:405
+#: calendar/gui/calendar-commands.c:414
 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/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
 #: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:435
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:442
 #: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
 #: my-evolution/e-summary-calendar.c:240
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/calendar-commands.c:579
+#: calendar/gui/calendar-commands.c:604
 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."
@@ -1982,20 +3036,20 @@ msgstr "W"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:641
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:640
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:639
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Baja"
 
@@ -2029,20 +3083,13 @@ msgstr "En proceso"
 msgid "Completed"
 msgstr "Completado"
 
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
-msgid "Cancelled"
-msgstr "Cancelar"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:842 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -2083,14 +3130,13 @@ msgid "Undefined"
 msgstr "Sin definir"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1404
-#: mail/mail-accounts.c:134 mail/mail-accounts.c:374
-#: mail/mail-config.glade.h:47 shell/e-shell-view.c:1380
-#: 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
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
 msgid "None"
 msgstr "Ninguno"
 
@@ -2104,13 +3150,13 @@ msgstr "Asignado"
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
 #: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1279
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Si"
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1280
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "No"
 
@@ -2130,52 +3176,82 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:57
 msgid "Description contains"
 msgstr "La descripciСn contiene"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:378
-msgid "Category:"
-msgstr "CategorМas:"
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
 
-#. All, Unmatched, separator items
-#: calendar/gui/cal-search-bar.c:498
-msgid "All"
-msgstr "Todo"
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Calendario"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
 
-#: calendar/gui/cal-search-bar.c:503
-msgid "Unfiled"
-msgstr "Sin archivar"
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Tareas"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Carpeta virtual segЗn la Lista de Correo"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Crear una nueva cita"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr "Nueva cit_a"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Crear una nueva tarea"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Nueva tarea"
 
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrarА el calendario"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr "Opciones de las Alarmas Auditivas"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr "Opciones de los Mensajes de Alarma"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr "Opciones de las Alarmas de Correo"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr "Opciones de las Alarmas de Correo"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr "Opciones de Alarmas Desconocidas"
 
@@ -2223,95 +3299,95 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr "%d dМas"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 dМa"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 semana"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 hora"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Tocar un sonido"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
 #: calendar/gui/dialogs/meeting-page.c:601
 #: calendar/gui/dialogs/meeting-page.c:636
 #: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1251
-#: calendar/gui/dialogs/meeting-page.c:1267
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:409
 msgid "before start of appointment"
 msgstr "antes comenzar la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 msgid "after start of appointment"
 msgstr "tras iniciar la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 msgid "before end of appointment"
 msgstr "antes de finalizar la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 msgid "after end of appointment"
 msgstr "tras finalizar la cita"
 
@@ -2322,7 +3398,6 @@ msgstr "Bases"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Fecha/Hora:"
 
@@ -2332,7 +3407,7 @@ msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -2361,7 +3436,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:113
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -2378,161 +3453,227 @@ msgid "10 minutes"
 msgstr "10 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 horas (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 horas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Calendar Preferences"
-msgstr "Preferencias del calendario"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "_ConfiguraciСn del calendario..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
 msgstr "Color para las tareas fuera de plazo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for tasks due today"
 msgstr "Color para las tareas para hoy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Compress weekends in month view"
-msgstr "Comprimir fines de semana en la vista mensual"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:26
-msgid "Display"
-msgstr "Mostrar"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Crear una nueva cita"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "End of day:"
-msgstr "Fin del dМa:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "Days"
+msgstr "dМas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "First day of week:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#, fuzzy
+msgid "First day of wee_k:"
 msgstr "Primer dМa de la semana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Fri"
-msgstr "Vier"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Viernes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Mon"
-msgstr "Lun"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#, fuzzy
+msgid "Hours"
+msgstr "horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, fuzzy
+msgid "Minutes"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Lunes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Overdue tasks:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "O_verdue tasks:"
 msgstr "Tareas fuera de plazo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Sat"
-msgstr "Sab"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "SАbado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Show appointment end times in week and month views"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
 msgstr ""
 "Mostrar la hora del final de las citas en las vistas semanales y mensuales"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Show week numbers in date navigator"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#, fuzzy
+msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los nЗmeros de las semanas en el navegador de fechas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Start of day:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "Sta_rt of day:"
 msgstr "Comienzo del dМa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Sun"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#, fuzzy
+msgid "Su_n"
 msgstr "Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Task List"
-msgstr "Lista de Tareas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "T_hu"
+msgstr "Jue"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Tasks due today:"
-msgstr "Tareas de plazo hoy:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "T_ue"
+msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Thu"
-msgstr "Jue"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Tareas de plazo hoy:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Jueves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr "Hora"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Time divisions:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr "Zona horaria:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#, fuzzy
+msgid "Time di_visions:"
 msgstr "DivisiСnes de tiempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr "Formato del tiempo:"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Martes"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "MiИrcoles"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
+msgid "Work Week"
+msgstr "Semana Laboral"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 horas (am/pm)"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Time zone:"
-msgstr "Zona horaria:"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 horas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Tue"
-msgstr "Mar"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Martes"
+#, fuzzy
+msgid "_Compress weekends in month view"
+msgstr "Comprimir fines de semana en la vista mensual"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Wed"
-msgstr "Mier"
+#, fuzzy
+msgid "_Display"
+msgstr "Mostrar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "MiИrcoles"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Fin del dМa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Work Week"
-msgstr "Semana Laboral"
+#, fuzzy
+msgid "_Fri"
+msgstr "Vier"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_General"
+msgstr "General"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Ocultar mensajes _borrados"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Mon"
+msgstr "Lun"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Other"
+msgstr "Otro"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Sat"
+msgstr "Sab"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "_Task List"
+msgstr "Lista de Tareas"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Wed"
+msgstr "Mier"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr "antes comenzar la cita"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2595,61 +3736,56 @@ 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:154
-#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:634 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr "(Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:636 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:641 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Falta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:643 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Falta "
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:465
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:479
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:843 mail/mail-callbacks.c:1485
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "©Sobreescribir archivo?"
 
-#: calendar/gui/dialogs/comp-editor.c:847 mail/mail-callbacks.c:1490
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2657,12 +3793,12 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "©Sobreescribirlo?"
 
-#: calendar/gui/dialogs/comp-editor.c:910 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1063
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr "║Imposible obtener versiСn actual!"
 
@@ -2720,28 +3856,6 @@ msgstr "Delegado A:"
 msgid "Enter Delegate"
 msgstr "Escribir delegado"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr "Selecciones un Zona Horaria"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "SecciСn:"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Zona Horaria"
-
-#: 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 ""
-"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:156
 msgid "Appointment"
 msgstr "Cita"
@@ -2816,83 +3930,83 @@ msgstr "Hora de _inicio:"
 
 #: calendar/gui/dialogs/meeting-page.c:576
 #: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1179
-#: calendar/gui/dialogs/meeting-page.c:1247
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr "Individual"
 
 #: calendar/gui/dialogs/meeting-page.c:578
 #: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1248
+#: calendar/gui/dialogs/meeting-page.c:1252
 msgid "Group"
 msgstr "Grupo"
 
 #: calendar/gui/dialogs/meeting-page.c:580
 #: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1249
+#: calendar/gui/dialogs/meeting-page.c:1253
 msgid "Resource"
 msgstr "Recurso"
 
 #: calendar/gui/dialogs/meeting-page.c:582
 #: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1250
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr "HabitaciСn"
 
 #: calendar/gui/dialogs/meeting-page.c:611
 #: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1263
+#: calendar/gui/dialogs/meeting-page.c:1267
 msgid "Chair"
 msgstr "Silla"
 
 #: calendar/gui/dialogs/meeting-page.c:613
 #: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1181
-#: calendar/gui/dialogs/meeting-page.c:1264
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "Participantes requeridos"
 
 #: calendar/gui/dialogs/meeting-page.c:615
 #: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1265
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Participantes opcional"
 
 #: calendar/gui/dialogs/meeting-page.c:617
 #: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1266
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "No participan"
 
 #: calendar/gui/dialogs/meeting-page.c:663
 #: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1189
-#: calendar/gui/dialogs/meeting-page.c:1292
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 msgid "Needs Action"
 msgstr "Necesita acciСn"
 
 #: calendar/gui/dialogs/meeting-page.c:665
 #: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1293
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: calendar/gui/dialogs/meeting-page.c:667
 #: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1294
+#: calendar/gui/dialogs/meeting-page.c:1298
 msgid "Declined"
 msgstr "Rechazado"
 
 #: calendar/gui/dialogs/meeting-page.c:669
 #: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1295
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentativa"
 
 #: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1296
+#: calendar/gui/dialogs/meeting-page.c:1300
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -2906,31 +4020,31 @@ msgid "That person is already attending the meeting!"
 msgstr "║Esa persona ya estА participando en la reuniСn!"
 
 #: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Chair Persons"
 msgstr "Presidentes"
 
 #: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:838
-#: calendar/gui/dialogs/meeting-page.c:958
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
 #: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
 #: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr "No participan"
 
-#: calendar/gui/dialogs/meeting-page.c:916
+#: calendar/gui/dialogs/meeting-page.c:920
 msgid "Sent By:"
 msgstr "Enviado Por:"
 
-#: calendar/gui/dialogs/meeting-page.c:1467
+#: calendar/gui/dialogs/meeting-page.c:1471
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
@@ -2973,7 +4087,7 @@ 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:83
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -3020,7 +4134,7 @@ msgstr "en el"
 msgid "th"
 msgstr "╨"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr "ocurrencias"
 
@@ -3115,7 +4229,7 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
@@ -3205,48 +4319,51 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3378
-#: calendar/gui/e-week-view.c:3230 mail/folder-browser.c:1278
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3387
-#: calendar/gui/e-week-view.c:3239 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3389
-#: calendar/gui/e-week-view.c:3241 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:32 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3364
-#: calendar/gui/e-day-view.c:3391 calendar/gui/e-week-view.c:3217
-#: calendar/gui/e-week-view.c:3243 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:862
+#: calendar/gui/e-calendar-table.c:863
 msgid "_Mark as Complete"
 msgstr "_Marcar como completo"
 
-#: calendar/gui/e-calendar-table.c:864
+#: calendar/gui/e-calendar-table.c:865
 msgid "_Delete this Task"
 msgstr "_Borrar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr "_Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:869
+#: calendar/gui/e-calendar-table.c:870
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1129
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 msgstr "Pulse aquМ para aЯadir una tarea"
 
 #: calendar/gui/e-calendar-table.etspec.h:3
@@ -3286,7 +4403,11 @@ msgstr "Prioridad"
 msgid "Start Date"
 msgstr "Fecha de Inicio"
 
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Resumen"
 
@@ -3329,120 +4450,230 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3357
-msgid "New _Appointment"
-msgstr "Nueva cit_a"
-
-#: calendar/gui/e-day-view.c:3359 calendar/gui/e-week-view.c:3212
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el dМa"
 
-#: calendar/gui/e-day-view.c:3369 calendar/gui/e-week-view.c:3222
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3371 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3380 calendar/gui/e-week-view.c:3232
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 msgid "_Delete this Appointment"
 msgstr "_Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:3399 calendar/gui/e-week-view.c:3257
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3401 calendar/gui/e-week-view.c:3259
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3403 calendar/gui/e-week-view.c:3261
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-itip-control.c:697
-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:617
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Obtener la Зlrima informaciСn de las reuniones"
+
+#: calendar/gui/e-itip-control.c:618
+#, fuzzy
+msgid "Meeting Information"
+msgstr "InformaciСn Opcional"
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is a meeting request."
-msgstr "Esta es una peticiСn de reuniСn."
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "ReuniСn"
 
-#: calendar/gui/e-itip-control.c:703
-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:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-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:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Hora de _fin de la reuniСn:"
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:632
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Obtener la Зlrima informaciСn de las reuniones"
+
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
 msgstr "Esta es una respuesta a una peticiСn de encuentro."
 
-#: calendar/gui/e-itip-control.c:712
-msgid "This is an event cancellation."
-msgstr "Esta es la cancelaciСn de un evento."
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "ReuniСn"
 
-#: calendar/gui/e-itip-control.c:715 calendar/gui/e-itip-control.c:755
-#: calendar/gui/e-itip-control.c:783
-msgid "The message is not understandable."
-msgstr "Este mensaje no es comprensible."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-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:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Elija un archivo"
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a task request."
-msgstr "Esta es una peticiСn de tarea."
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-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:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Buscar en Mensaje"
 
-#: calendar/gui/e-itip-control.c:749
-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:665
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:752
-msgid "This is an task cancellation."
-msgstr "Esto es una cancelaciСn de tarea."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "InformaciСn"
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:837
-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:676
+#, fuzzy
+msgid "Task Update"
+msgstr "estaba despuИs de"
+
+#: calendar/gui/e-itip-control.c:680
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Esta es una peticiСn para la Зltima informaciСn de la tarea."
+
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Responder"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:691
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Esto es una cancelaciСn de tarea."
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Mensaje del Calendario"
+
+#: calendar/gui/e-itip-control.c:713
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "InformaciСn de la Fuente"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "Esta es una peticiСn para la Зltima informaciСn de la tarea."
+
+#: calendar/gui/e-itip-control.c:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:856
-msgid "The message contains only unsupported requests."
-msgstr "Este mensaje solo contiene peticiones no soportadas."
+#: calendar/gui/e-itip-control.c:723
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr "Esta es una respuesta a una peticiСn de encuentro."
 
-#: calendar/gui/e-itip-control.c:880
-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:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:992
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Mensaje previo"
+
+#: calendar/gui/e-itip-control.c:940
 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:1018
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Fecha Completada:"
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "║No pude quitar el elemento del archivo de su calendario!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% Completo"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Fecha de envМo"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3490,16 +4721,16 @@ msgstr "No puedo cargar las tareas en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "El mИtodo necesario para cargar `%s' no esta soportado"
 
-#: calendar/gui/e-week-view.c:3210 calendar/gui/e-week-view.c:3248
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
-#: calendar/gui/gnome-cal.c:1248
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:1259
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El mИtodo necesario para abrir `%s' no esta soportado"
@@ -3560,7 +4791,7 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
@@ -3716,12 +4947,6 @@ msgstr "Vier"
 msgid "Sa"
 msgstr "Sab"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-shortcuts.c:1025
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Tareas"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3755,9 +4980,8 @@ msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1854 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -3908,7 +5132,12 @@ msgstr ""
 "has-categories? espera que todos los argumentos sean cadenas o que uno y "
 "solo un argumento sea un booleano falso (#f)"
 
-#: calendar/pcs/query.c:967
+#: calendar/pcs/query.c:805
+#, fuzzy
+msgid "is-completed? expects 0 arguments"
+msgstr "time-now espera 0 argumentos"
+
+#: calendar/pcs/query.c:1008
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 "La evaluaciСn de la expresiСn de bЗsqueda no ha devuelto un valor booleano"
@@ -4226,7 +5455,7 @@ msgid "Connection cancelled"
 msgstr "ConexiСn cancelada"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
@@ -4370,7 +5599,7 @@ msgstr "Estado de la autenticaciСn desconocido."
 
 #: 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:52
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "Clave"
 
@@ -4399,37 +5628,37 @@ msgstr "AutenticaciСn POP antes de SMTP usando una fuente no pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "FallС la compilaciСn de la expresiСn regular: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "La URL '%s' necesita un componente de usuario"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "La URL '%s' necesita un componente de servidor"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "La URL '%s' necesita un componente de ruta"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Error al resolver: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Error al resolver: %s: servidor no encontrado"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Error al resolver: %s: razСn desconocida"
@@ -4493,7 +5722,7 @@ msgstr "Error al docodificar el mensaje."
 msgid "Failed to verify certificates."
 msgstr "Error al verificar el certificado."
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4503,7 +5732,7 @@ msgstr ""
 "Asunto: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4599,21 +5828,21 @@ msgstr "La carpeta fue destruida y recreada en el servidor."
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1478
-#: camel/providers/imap/camel-imap-folder.c:1902
+#: camel/providers/imap/camel-imap-folder.c:1491
+#: 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:1620
-#: camel/providers/imap/camel-imap-folder.c:1701
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo informciСn de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:1626
+#: camel/providers/imap/camel-imap-folder.c:1640
 msgid "Scanning for new messages"
 msgstr "Buscando mensajes nuevos"
 
-#: camel/providers/imap/camel-imap-folder.c:1935
+#: 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"
 
@@ -4630,7 +5859,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:653
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -4668,7 +5897,7 @@ 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:473
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No hay soporte para el tipo de autenticaciСn %s"
@@ -4679,7 +5908,7 @@ 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:512
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "No escribiС una clave."
 
@@ -4694,12 +5923,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:327
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1023
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No estА permitido que la carpeta raiz contenga subcarpetas"
 
@@ -4976,8 +6205,9 @@ 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:1549
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Sincronizando carpeta"
 
 #: camel/providers/local/camel-mbox-summary.c:507
@@ -5189,35 +6419,35 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "No pude abrir o crear el archivo .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:193
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Obteniendo resumen POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "No pude comprobar si hay nuevos mensajes en el servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:239
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "No pude abrir la carpeta: listados de los mensajes incompletos."
 
-#: camel/providers/pop3/camel-pop3-folder.c:332
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "No pude obtener el mensaje: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:348
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "No pude obtener los mensajes del servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hay mensajes con uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:375
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Obteniendo mensaje POP %d"
@@ -5235,7 +6465,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:51
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5328,7 +6558,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:70
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5381,7 +6611,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:63
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5389,124 +6619,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:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Error de sintaxis, comando no reconocido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 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:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "ParАmetro del comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 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:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Mensaje de ayuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Servicio cerrando los canales de transmisiСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio no disponible, cerrando los canales de transmisiСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "AcciСn de correo requerida en orden, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 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:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 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:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 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:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "AcciСn solicitada abortada: error en procesamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 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:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 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:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 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:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 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:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 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:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Fallo en la transacciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "Es necesaria una transiciСn de contraseЯa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "El mИtodo de autenticaciСn en demasiado debil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 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:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal en la autenticaciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "AutenticaciСn requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, 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:377
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:416
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:439
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5517,128 +6747,128 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "EnvМo de correo SMTP vМa %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:583
 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:589
+#: camel/providers/smtp/camel-smtp-transport.c:590
 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:594 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr "Saludo del SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:727
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, 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:759
+#: camel/providers/smtp/camel-smtp-transport.c:760
 msgid "SMTP Authentication"
 msgstr "AutentificaciСn SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:766
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticaciСn SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "ExpirС el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr "Error en la peticiСn de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:850
 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:875
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:894
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, 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:919
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:938
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:969
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:988
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:1005
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "ExpirС el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, 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:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Respuesta de error a QUIT: %s: no es fatal"
@@ -5668,7 +6898,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "adjunto"
 
@@ -5759,7 +6989,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Adjuntar un fichero"
 
-#: composer/e-msg-composer.c:687
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5768,7 +6998,7 @@ msgstr ""
 "No puedo abrir el archivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5777,29 +7007,29 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:890
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr "║Aviso!"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, ©Sobreescribir?"
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:943
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5807,16 +7037,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:1064
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1078
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5825,7 +7055,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5834,7 +7064,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5843,15 +7073,16 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1193
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution ha encontrado archivos no guardados de una sesiСn previas.\n"
 "©Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5861,24 +7092,24 @@ msgstr ""
 "\n"
 "©Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1348 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1520
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "Insertar Archivo"
 
-#: composer/e-msg-composer.c:1894 composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2384
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
@@ -5906,55 +7137,101 @@ msgstr "tarjeta de direcciСn"
 msgid "calendar information"
 msgstr "informaciСn del calendario"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "contiene"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "no contiene"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "no contiene"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "El nombre contiene"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "La descripciСn contiene"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "El nombre contiene"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "El nombre contiene"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "no contiene"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr "%Y/%m/%d"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr "%x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5962,13 +7239,13 @@ 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:303
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -6066,7 +7343,7 @@ msgstr "una fecha relativa al momento actual"
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "ahora"
 
@@ -6078,11 +7355,15 @@ msgstr " hace"
 msgid "ago"
 msgstr "hace"
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<pinche aquМ para aЯadir una fecha>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Reglas para los filtro"
 
@@ -6104,7 +7385,7 @@ msgstr ""
 "Por favor vuelve y especifica una carpeta vАlida donde entregar el correo."
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:796
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -6116,7 +7397,7 @@ msgstr "Escribir URI de la carpeta"
 msgid "<click here to select a folder>"
 msgstr "<pinche aquМ para seleccionar una carpeta>"
 
-#: filter/filter-input.c:197
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6166,30 +7447,22 @@ msgid "outgoing"
 msgstr "saliente"
 
 #: filter/filter.glade.h:1
-msgid "Add"
-msgstr "AЯadir"
-
-#: filter/filter.glade.h:3
-msgid "Edit"
-msgstr "Editar"
-
-#: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Editar filtros"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Editar carpeta virtual"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Entrando"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Saliente"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Carpetas virtuales"
 
@@ -6307,7 +7580,7 @@ msgstr "Respondido a"
 msgid "Score"
 msgstr "PuntuaciСn"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1070
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Remitente"
 
@@ -6429,14 +7702,13 @@ msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Oops.  Debes especificar al menos una carpeta como fuente."
 
 #: 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importar"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Correo"
 
@@ -6464,11 +7736,11 @@ msgstr ""
 "Evolution ha encontrado archivos de GnomeCard.\n"
 "©Quiere importarlos a Evolution?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "ConfiguraciСn"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6524,164 +7796,179 @@ 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:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Carpeta virtual segЗn la Lista de Correo"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr "Esta carpeta no contiene mensajes."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "_Mensaje de correo"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "_Mensaje de correo"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para ╚%s╩"
 
-#: mail/folder-browser-ui.c:258
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:232 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:900
+#: mail/folder-browser.c:909
 msgid "Create vFolder from Search"
 msgstr "Crear carpeta virtual de la bЗsqueda"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "VFolder segЗn el a_sunto"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "VFolder segЗn el _remitente"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "VFolder segЗn los _destinatarios"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual segЗn la _Lista de Correo"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Filtrar segЗn el As_unto"
 
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Filtrar segЗn el Re_mitente"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Filtrar segЗn los Des_tinatarios"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Filtrar segЗn la Lista de _Correo"
 
-#: mail/folder-browser.c:1280
-msgid "R_esend..."
-msgstr "R_eenviar..."
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "Imprimir Mensaje..."
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:96
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: mail/folder-browser.c:1284 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Mar_car como leМdo"
 
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _no leМdo"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr "Marcar como No Im_portante"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "AЯadir Remitente a la Agenda de Direcciones"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1487
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filtrar segЗn la lista de correo"
 
-#: mail/folder-browser.c:1488
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "Carpeta virtual segЗn la Lista de Correo"
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar segЗn la lista de correo (%s)"
 
-#: mail/folder-browser.c:1491
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Carpeta virtual segЗn la Lista de Correo (%s)"
 
-#: mail/folder-info.c:60
+#: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Obteniendo informaciСn de la carpeta"
 
@@ -6746,15 +8033,15 @@ msgid "Evolution News Editor"
 msgstr "Editor de Noticias de Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:986
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "Guardar firma"
 
-#: mail/mail-account-gui.c:992
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6764,38 +8051,43 @@ msgstr ""
 "\n"
 "©Quiere guardar los cambios?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr "(valores predeterminados)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Deshabilitado"
 
-#: mail/mail-accounts.c:176
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Habilitado"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "©Esta seguro que quiere borrar esta cuenta?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr "No borrar"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr "©Realmente quiere borrar realmente la cuenta?"
 
-#: mail/mail-accounts.c:495 mail/mail-accounts.c:499
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "©Esta seguro que quiere borrar esta cuenta de noticias?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:741
-msgid "Evolution Account Manager"
-msgstr "Administrador de cuentas de Evolution"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "_ConfiguraciСn del correo..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6821,7 +8113,7 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "AЯadir Regla de Filtro"
 
-#: 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"
@@ -6833,7 +8125,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "©QuerrМa configurarlo ahora?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6841,7 +8133,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6849,11 +8141,11 @@ msgstr ""
 "Necesita configurar un transporte de\n"
 "correo para poder enviarlo."
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "No has definido un sistema para enviar el correo"
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6861,7 +8153,7 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "©Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6873,37 +8165,36 @@ msgstr ""
 "cabecera Apparently-To.\n"
 "©Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:389
+#: mail/mail-callbacks.c:390
 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:632
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "El dМa %s, %s escribiС:"
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1366
 #, 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:1383
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6911,7 +8202,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:1417
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6919,24 +8210,41 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:1429
+#: mail/mail-callbacks.c:1434
 #, 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:1450
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:1534
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:1536
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:1759
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Aviso"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "No me preguntes mАs veces"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6945,60 +8253,70 @@ msgstr ""
 "Error cargando la informaciСn del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1769
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:1815
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1861
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresiСn del mensaje"
 
-#: mail/mail-callbacks.c:1945
+#: mail/mail-callbacks.c:2012
 #, 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?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "Por favor escribe debajo tu nombre y direcciСn de correo. Los campos  "
 "╚opcionales╩ no hace falta que los rellenes, a menos que quieras incluir "
 "esta informaciСn en las cartas que envies."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Por favor rellena la informaciСn acerca del servidor de correo de entrada. "
 "Si no sabes que clase de servidor estas usando, preguntale a tu "
 "administrador de sistemas o a tu Proveedor de Servicios de Internet."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Por favor escriba debajo la informaciСn acerca del protocolo de salida de su "
 "correo. Si no sabes que protocolo usas, preguntale a tu administrador de "
 "sistemas o a tu Proveedor de Servicios de Internet."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "Casi has acabado con el proceso de configuraciСn del correo. La identidad, "
 "el servidor de correo de entrada y el mИtodo de envМo de correo que has "
@@ -7007,15 +8325,26 @@ msgstr ""
 "usarА para mostrar informaciСn."
 
 #. set window title
-#: mail/mail-config-druid.c:463
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Configurador de cuentas de Evolution"
 
-#: mail/mail-config.c:1570
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Inbox"
+
+#: mail/mail-config.c:1809
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:1641 mail/mail-config.c:1644
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -7107,11 +8436,15 @@ msgstr "Juego de caracteres predeterminado: "
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Mostrar"
+
 #: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Borradores"
 
@@ -7123,198 +8456,205 @@ msgstr "Carpeta de borradores:"
 msgid "E_nable"
 msgstr "_Habilitado"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Guardar el archivo actual con un nombre diferente"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Editar..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "Archivo de firma en HTML:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "Correo en HTML"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Incluido en lМnea"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "ConfiguraciСn del correo"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "LocalicaciСn del Mailbox"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Hacer de esta mi cuenta pre_determinada"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr "La _previsualizaciСn de los mensajes debe mostrarse por defecto"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr "La lista de mensajes debe mostrarse enlazada por defec_to"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Noticias"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "InformaciСn Opcional"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "ID de la clave PGP:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Pr_eguntar al mandar mensajes con el asunto vacio"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Preguntar al mandar mensajes que tan solo tengan definido el _Cco"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Recibiendo Mensajes"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Recibiendo Opciones"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "InformaciСn Requerida"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "MIME seguro"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Seguridad"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Elega un archivo de log para los filtros..."
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:71 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Enviado"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Carpeta de mensajes enviados:"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "ConfiguraciСn del servidor"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Tipo de servidor:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
 msgstr "El servidor requiere _autenticaciСn"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Archivo de firma:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Fuente"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "InformaciСn de la Fuente"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Fuentes"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Carpetas Especiales"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Mabox estАndar de Unix"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr "Use conexiones seguras (_SSL)"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7322,103 +8662,103 @@ msgstr ""
 "\n"
 "Pulse ╚Siguiente╩ para comenzar. "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "C_argar imagenes fuera de la red"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
 msgstr "Comprobar el correo _automАticamente cada"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
 msgstr "_Comprobar tipos soportados"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
 msgstr "Dir_ecciСn de correo:"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
 msgstr "Vaciar pap_elera al salir"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:98
 msgid "_Full Name:"
 msgstr "_Nombre completo:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "Firma en _HTML:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr "_Resaltadar citas con"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
 msgstr "Cargar imАgenes si e_l remitente esta el la agenda de direcciones"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr "Registrar acciones de _los filtros en:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
 msgstr "_Marcar mensajes como LeМdo tras"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr "_No cargar nunca imАgenes desde la red"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 msgid "_Organization:"
 msgstr "_OrganizaciСn:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr "LocalizaciСn del binario de _PGP:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr "_Recordar la frase de paso de PGP hasta salir del programa"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Recuerda esta contraseЯa"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "Enviar el men_saje en formato HTML de forma predeterminada"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "_Archivo de firma:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr "placeholder"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "segundos."
 
@@ -7458,76 +8798,82 @@ 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:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (vМa %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "Abrir Enlaze en el Navegador"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Copiar DirecciСn del Enlaze"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr "Guardar Enlaze como (ARREGLAME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: mail/mail-folder-cache.c:146
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/mail-folder-cache.c:152 mail/mail-folder-cache.c:159
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:153
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/mail-folder-cache.c:162
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Borrado"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr "%d total"
@@ -7620,17 +8966,22 @@ msgstr "Puntero a datos externos desconocidos (tipo ╚%s╩)"
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:459
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "No existe la carpeta %s"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Abriendo '%s'"
 
-#: mail/mail-local.c:749
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta ╚%s╩ al formato ╚%s╩"
 
-#: mail/mail-local.c:870
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7706,7 +9057,7 @@ msgstr "Enviando mensaje %d de %d"
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Completado."
 
@@ -7738,7 +9089,7 @@ msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en ╚%s╩"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Papelera"
 
@@ -7746,7 +9097,7 @@ msgstr "Papelera"
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
@@ -7756,35 +9107,45 @@ msgstr "Abriendo carpeta %s"
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Abriendo carpeta %s"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1599
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Sincronizando carpeta"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1684
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1751
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7793,7 +9154,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7802,11 +9163,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7815,12 +9176,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2131
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
@@ -7833,31 +9194,31 @@ msgstr "_Buscar"
 msgid "(Untitled Message)"
 msgstr "(Mansaje sin tМtulo)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 msgid "Untitled Message"
 msgstr "Mensaje sin tМtulo"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 msgid "Empty Message"
 msgstr "Mensaje vacМo"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "Buscar en Mensaje"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "Sensible a mayusculas"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr "Buscar hacia adelante"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Buscar:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Coincide:"
 
@@ -7877,7 +9238,7 @@ msgstr "Actualizando..."
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Cancelado"
 
@@ -7899,15 +9260,15 @@ msgstr "Reenviado mensaje - %s"
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 msgid "Forwarded Message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-vfolder.c:282
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
@@ -7920,63 +9281,59 @@ msgstr "(Sin asunto)"
 msgid "%s - Message"
 msgstr "%s - Mensaje"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:632
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "Multiples mensajes sin leer"
 
-#: mail/message-list.c:633
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Multiples mensajes"
 
-#: mail/message-list.c:637
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "La mАs baja"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "MАs baja"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "MАs alta"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "La mАs alta"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:929
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:931
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
@@ -7984,10 +9341,6 @@ msgstr "%b %d %Y"
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: mail/message-list.c:2324
-msgid "Updating message list"
-msgstr "Actualizando la lista de mensajes"
-
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Marcado"
@@ -8000,36 +9353,36 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "TamaЯo"
 
-#: mail/subscribe-dialog.c:166
+#: mail/subscribe-dialog.c:174
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Escaneando carpetas bajo %s en ╚%s╩"
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Escaneando carpetas de nivel superior en ╚%s╩"
 
-#: mail/subscribe-dialog.c:267
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Suscribiendo a carpeta ╚%s╩"
 
-#: mail/subscribe-dialog.c:269
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Dessuscribiendo la carpeta ╚%s╩"
 
-#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Carpeta"
 
-#: mail/subscribe-dialog.c:1432
+#: mail/subscribe-dialog.c:1490
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningЗn servidor"
 
-#: mail/subscribe-dialog.c:1489
+#: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
 msgstr "Por favor seleccione un servidor."
 
@@ -8073,7 +9426,11 @@ msgstr "Componente Evolution para el resumen de trabajo."
 msgid "Factory for the Evolution executive summary component."
 msgstr "FactorМa para el componente resumen de trabajo de Evolution."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "No puedo inicializar el componente de resumen de trabajo de Evolution."
 
@@ -8093,33 +9450,43 @@ msgstr "%l:%M%p"
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Palabra del DМa"
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr "Frase del DМa"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr "AЯadir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Escriba la URL de la fuente de noticias que quiere aЯadir"
 
-#: my-evolution/e-summary-preferences.c:881
+#: my-evolution/e-summary-preferences.c:889
 msgid "Name:"
 msgstr "Nombre:"
 
-#: my-evolution/e-summary-preferences.c:1403
-msgid "My Evolution Settings"
-msgstr "ConfiguraciСn de Mi Evolution"
+#: my-evolution/e-summary-preferences.c:1421
+#, fuzzy
+msgid "Summary Settings"
+msgstr "El resumen contiene"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8129,6 +9496,11 @@ msgstr "Hubo un error descargando la fuente de noticias"
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Error obteniendo RDF</b>"
 
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Fuentes de _noticias"
+
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr "No hay tareas"
@@ -8137,25 +9509,33 @@ msgstr "No hay tareas"
 msgid "My Weather"
 msgstr "Mi Tiempo"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>No se ha podido conectar con el servidor de tiempo</b></dd>"
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "_Tiempo"
+
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Regiones"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
-msgstr "%A, %d %B %Y"
+#, fuzzy
+msgid "%A, %B %e %Y"
+msgstr "%A, %d de %B de %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
-msgstr "Imprimir Mi Evolution"
+#, fuzzy
+msgid "Print Summary"
+msgstr "Resumen"
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
-msgstr "La impresiСn de Mi Evolution ha fallado"
+#, fuzzy
+msgid "Printing of Summary failed"
+msgstr "Ha fallado la impresiСn del mensaje"
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
@@ -9363,10 +10743,6 @@ msgstr "_Todas las carpetas:"
 msgid "All news _feeds:"
 msgstr "Todas las _fuentes de noticias:"
 
-#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1024
-msgid "Calendar"
-msgstr "Calendario"
-
 #: my-evolution/my-evolution.glade.h:7
 msgid "How many days should the calendar display at once?"
 msgstr "©Cuantos mensajes debe mostrar de una vez el calendario?"
@@ -9475,7 +10851,16 @@ msgstr "Mostrar Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar OperaciСn"
 
-#: shell/e-local-storage.c:551
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Carpetas Locales"
 
@@ -9531,7 +10916,7 @@ msgstr ""
 "Ha ocurrido un error mientras se copiaban archivos a\n"
 "`%s'."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9542,7 +10927,7 @@ msgstr ""
 "Por favor, renombre lo para permitir la instalaciСn\n"
 "de los archivos de usuario de Evolution."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9556,7 +10941,7 @@ msgstr ""
 "Evolution.\n"
 "©Quiere que borre ese directorio?"
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9579,48 +10964,57 @@ msgstr "No puedo copiar una carpeta sobre si misma."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "No puedo mover una carpeta a uno de sus descendientes."
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Especificar una carpeta en la que copiar la carpeta ╚%s╩:"
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Copiar una carpeta"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Especificar una carpeta a la que mover la carpeta ╚%s╩:"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Mover una carpeta"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"No pude borrar la carpeta `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Borrar carpeta '%s'"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:377
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "©Esta seguro que quiere borrar la carpeta `%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:452
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Renombrar carpeta '%s'"
 
-#: shell/e-shell-folder-commands.c:456 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Renombrar"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:464
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nombre de la carpeta:"
@@ -9650,11 +11044,11 @@ msgstr ""
 "El tipo de carpeta seleccionada no es valido para\n"
 "la operaciСn requerida."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Nuevo..."
 
-#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Sin tМtulo)"
 
@@ -9693,7 +11087,7 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9742,7 +11136,7 @@ msgstr "AutomАtico"
 msgid "Filename:"
 msgstr "Nombre de fichero:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Elega un archivo"
 
@@ -9750,11 +11144,11 @@ msgstr "Elega un archivo"
 msgid "File type:"
 msgstr "Tipo de archivo:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
@@ -9762,19 +11156,41 @@ msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "No puedo inicializar la shell de Evolution: %s"
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 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:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9784,90 +11200,90 @@ 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:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
 msgstr "Crear un nuevo atajo"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 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:702
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr "Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:715 shell/e-shell-view-menu.c:728
-#: ui/evolution.xml.h:35
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:177
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrАndose)"
 
-#: shell/e-shell-view.c:1385
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1387
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1425
+#: shell/e-shell-view.c:1499
 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:1432
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution estА en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1438
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution estА desconectado.  Pulse este botСn para trabajar conectado."
 
-#: shell/e-shell.c:491
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1405
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Ooops!  La vista `%s' ha cesado inesperadamente. :-(\n"
 "Esto probablemente significa que el componente %s se ha roto."
 
-#: shell/e-shell.c:1609 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1611
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr "Argumentos invАlidos"
 
-#: shell/e-shell.c:1613
+#: shell/e-shell.c:1646
 msgid "Cannot register on OAF"
 msgstr "No puedo registrarme en OAF"
 
-#: shell/e-shell.c:1615
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr "No se encontrС la base de datos de configuraciСn"
 
-#: shell/e-shell.c:1617 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "Error genИrico"
 
@@ -9960,7 +11376,7 @@ msgstr "Renombrar atajos seleccionados a:"
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir la carpeta enlazada a este atajo"
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Abrir en una nueva ventana"
 
@@ -9976,68 +11392,64 @@ msgstr "Renombrar este atajo"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
-#: shell/e-shortcuts.c:620
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-shortcuts.c:1019
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-shortcuts.c:1023
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Contactos"
-
-#: shell/e-storage-set-view.c:1464 shell/e-summary-storage.c:78
-msgid "My Evolution"
-msgstr "Mi Evolution"
-
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Sin nombre)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Sin errores"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Es tipo de fichero especificado no es vАlido"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Error de I/O"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "No se encontrС la carpeta especificada"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "FunciСn sin implementar en este manejador"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "OperaciСn no soportada"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no esta soportado por este manejador"
 
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "No se encontrС la carpeta especificada"
+
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "No puedo mover una carpeta a uno de sus descendientes."
+
 #: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
@@ -10077,17 +11489,29 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Pulse ╚Importar╩ para comenzar a importar el archivo en Evolution. "
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Utilidad de ImportaciСn de Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Utilidad de ImportaciСn de Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Elega un archivo"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "Bienvenido a la Utilidad de ImportaciСn de Evolution.\n"
@@ -10107,7 +11531,8 @@ 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:"
+#, fuzzy
+msgid "Evolution can import data from the following files:"
 msgstr "Evolution ha encontrado las siguientes fuentes de datos:"
 
 #: shell/main.c:95
@@ -10148,29 +11573,29 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: shell/main.c:154
+#: shell/main.c:173
 msgid "Cannot access the Evolution shell."
 msgstr "No puedo acceder a la shell de Evolution."
 
-#: shell/main.c:163
+#: shell/main.c:184
 #, c-format
 msgid "Cannot initialize the Evolution shell: %s"
 msgstr "No puedo inicializar la shell de Evolution: %s"
 
-#: shell/main.c:221
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "Desahilitar pantalla de entrada"
 
-#: shell/main.c:222
+#: shell/main.c:229
 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:261
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Copiar"
 
@@ -10186,11 +11611,11 @@ msgstr "Crear nuevo contacto"
 msgid "Create new contact list"
 msgstr "Crear nueva lista de contactos"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Cortar"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Cortar la selecciСn"
 
@@ -10198,89 +11623,95 @@ msgstr "Cortar la selecciСn"
 msgid "Delete selected contacts"
 msgstr "Borrar los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Nuevo contacto"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "New List"
 msgstr "Nueva lista"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Pegar"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Pegar el contenido del porta papeles"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Vista previa de los contactos a imprimir"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Imprimir los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Guardar los contactos seleccionados en una VCard."
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Seleccionar todos los contactos"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Send _contact to other"
-msgstr "Enviar el _contacto a otro"
-
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send _message to contact"
-msgstr "Enviar un _mensaje al contacto"
+#
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Enviar un _mensaje al contacto..."
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send a mess to the selected contacts."
 msgstr "Enviar un mensaje a los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:27
+#
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Enviar un mensaje al contacto"
+
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
 msgstr "Enviar los contactos seleccionados a otra persona."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Parar la carga"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:29
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "A_cciones"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "Fuentes de la _Agenda..."
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact List"
 msgstr "Lista de _contactos"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
-#: ui/evolution-contact-editor.xml.h:16 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Contactos..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Im_primir..."
 
@@ -10289,16 +11720,18 @@ msgid "_Save as VCard"
 msgstr "G_uardar como vCard"
 
 #: ui/evolution-addressbook.xml.h:38
-msgid "_Search for contacts"
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "Bu_scar contactos"
 
 #: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Herramientas"
 
@@ -10307,108 +11740,131 @@ msgid "Configure the calendar's settings"
 msgstr "Configurar las opciones del calendario"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All-Day _Event"
+#, fuzzy
+msgid "Create a New All Day _Event"
 msgstr "Crear un nuevo _evento de todo el dМa"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a _New Appointment"
-msgstr "Crear una _nueva cita"
+#, fuzzy
+msgid "Create a New _Task"
+msgstr "Crear una nueva tarea"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Crear una nueva cita"
+msgid "Create a _New Appointment"
+msgstr "Crear una _nueva cita"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "Crear un evento para todo el dМa"
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Day"
+msgstr "_DМa"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Borrar esta cita"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ir a"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Volver en el tiempo"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Avanzar en el tiempo"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Ir a una _fecha"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Ir a una fecha especМfica"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Ir al momento actual"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Ir a _hoy"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "_Mes"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nueva cita"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Nueva tarea"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Vista previa del calendario a imprimir"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Imprimir calendario"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Vista pre_via"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Mostrar 1 dМa"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Mostrar 1 semana"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Mostrar un semana laboral"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "Semana lab_oral"
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "Week"
+msgstr "_Semana"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "Cit_a..."
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "_ConfiguraciСn del calendario..."
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Day"
-msgstr "_DМa"
-
-#: ui/evolution-calendar.xml.h:34
-msgid "_Month"
-msgstr "_Mes"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "InformaciСn Requerida"
 
-#: ui/evolution-calendar.xml.h:38
-msgid "_Week"
-msgstr "_Semana"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_Tarea"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10419,15 +11875,16 @@ msgid "Close"
 msgstr "Cerrar"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Cerrar esta cita"
+#, fuzzy
+msgid "Close this item"
+msgstr "Borrar este elemento"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Borrar esta cita"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Borrar este elemento"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
 
@@ -10435,90 +11892,58 @@ 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-tasks.xml.h:11
-msgid "Print Pre_view"
-msgstr "Vista pre_via"
-
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print S_etup"
-msgstr "Configurar Impr_esiСn"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Guardar"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
-msgstr "Guardar la cita y cerrar la ventana de diАlogo"
+#: ui/evolution-comp-editor.xml.h:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Guardar la lista y cerrar la ventana de diАlogo"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Guardar este elemento a disco"
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar los datos de la pАgina para la impresora actual"
-
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Archivo"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Borrar este elemento"
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Ayuda"
-
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Imprimir ca_becera..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:244
-msgid "Save"
-msgstr "Guardar"
-
-#: ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Guardar _como..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Guardar el contacto y cerrar la ventana de diАlogo"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "E_nviar el contacto a otro..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Ver la ayuda en lМnea"
-
-#
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Enviar un _mensaje al contacto..."
-
-#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
@@ -10550,19 +11975,19 @@ msgstr "Enviar un _mensaje a la lista..."
 msgid "Cancel Mee_ting"
 msgstr "Cancelar Encuen_tro"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "Cancelar el encuentro para este elemento"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Reenviar como i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Reenviar este elemento por correo"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr "Obtener la Зlrima informaciСn de las reuniones"
 
@@ -10574,7 +11999,7 @@ msgstr "Actualizar Encuentro"
 msgid "Schedule _Meeting"
 msgstr "Concertar un _encuentro"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Concertar un encuentro para este elemento"
 
@@ -10591,37 +12016,38 @@ msgid "Cancel the current mail operation"
 msgstr "Cancelar la operaciСn de correo actual"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Nuevo"
-
-#: ui/evolution-mail-global.xml.h:4
 msgid "Compose _New Message"
 msgstr "Componer un _nuevo mensaje"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 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:6
+#: ui/evolution-mail-global.xml.h:5
 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:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "Crear o editar definiciones de carpetas virtuales"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Vaciar _Papelera"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Olvidar _contraseЯa"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 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
+#, fuzzy
+msgid "New Message"
+msgstr "Siguiente mensaje"
+
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "Abrir una ventana para escribir un mensaje de correo"
@@ -10679,98 +12105,103 @@ msgstr "_Suscribirse a las carpetas..."
 msgid "Change the properties of this folder"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Copiar los mensajes _seleccionados"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Cortar"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Cortar lod mensajes seleccionados"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Ocultar los mensajes _seleccionados"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Ocultar mensajes _borrados"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Oculta_r mensajes leМdos"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Oculta los mensajes borrados en lugar de mostrarlos tachados por una lМnea"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Marcar todos como l_eМdos"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Marcar los mensajes visibles como leМdos"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Pegar el mensaje en el portapapeles"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Eliminar permanentemente todos los mansajes borrados de esta carpeta"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Seleccionar _Hilo"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Selecciona todos los mensajes que no estАn seleccionados actualmente"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Selecciona todos los mensajes en el mismo hilo que el mensaje seleccionado"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Seleccionar todos los mensajes visibles"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "M_ostrar mensajes ocultos"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Mostrar mensajes que han estado ocultos temporalmente"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Oculta temporalmente todos los mensajes que han sido leiods"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Oculta temporalmente los mensajes seleccionados"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Lista de Mensajes Encadenados"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:25
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Invertir selecciСn"
 
@@ -10991,7 +12422,8 @@ 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:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11010,38 +12442,34 @@ msgstr "Mensaje previo"
 msgid "Previous Unread Message"
 msgstr "Mensaje anterior no leМdo"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "Imprimir Mensaje..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "Vista previa..."
-
-#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Imprimir este mensaje"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Responder"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "Buscar M_ensaje"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 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:73
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar los datos de la pАgina para la impresora actual"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Mostrar la Fuente del Men_saje"
@@ -11094,30 +12522,26 @@ msgstr "_Copiar a la Carpeta"
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "_Mover a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr "Vista _Normal"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "_Abrir Mensaje"
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "_Re-send Message"
-msgstr "_Reenviar Mensaje"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
@@ -11125,12 +12549,12 @@ msgstr "Cerrar esta ventana"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Cerrar"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vista"
 
@@ -11321,7 +12745,7 @@ msgstr "Campo _Responder-A"
 msgid "_Security"
 msgstr "_Seguridad"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "A_yuda"
 
@@ -11354,14 +12778,29 @@ msgid "Unsubscribe"
 msgstr "Dessuscribir"
 
 #: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Assign Task"
+msgstr "Asignado"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Cancelar Tarea"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
-msgstr "Delegar tarea"
+#: ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Cancel this task"
+msgstr "Cancelar Tarea"
 
 #: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Obtain the latest task information"
+msgstr "Obtener la Зlrima informaciСn de las reuniones"
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "Re_leer Tarea"
 
@@ -11369,39 +12808,28 @@ msgstr "Re_leer Tarea"
 msgid "Configure the task view's settings"
 msgstr "Configurar la vista de las tareas"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "Copiar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Crear una nueva tarea"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "Cortar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 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:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Pegar la tarea del portapapeles"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr "Guardar la tarea como otra cosa"
-
 #: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings"
+#, fuzzy
+msgid "Tasks Settings..."
 msgstr "ConfiguraciСn de las tareas"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_Tarea"
 
@@ -11458,132 +12886,129 @@ msgid "Exit the program"
 msgstr "Salir del programa"
 
 #: ui/evolution.xml.h:16
-msgid "Getting _Started"
-msgstr "Comenzando"
-
-#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr "Importar un formato de archivo externo"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "Mueve esta carpeta a otro sitio"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "Abrir en una Nueva _Ventana"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Abre esta carpeta en una nueva ventana"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciСn acerca de Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Enviar reporte de fallo"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un reporte de fallo usando Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "Activar"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: ui/evolution.xml.h:31
-msgid "Using the C_ontact Manager"
-msgstr "Usando el administrador de c_ontactos"
-
-#: ui/evolution.xml.h:32
-msgid "Using the _Calendar"
-msgstr "Usando el _calendario"
-
-#: ui/evolution.xml.h:33
-msgid "Using the _Mailer"
-msgstr "Usando el _correo"
-
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "Barra de _carpetas"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: ui/evolution.xml.h:46
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "_Importar archivo..."
 
-#: ui/evolution.xml.h:47
-msgid "_Index"
-msgstr "_мndice"
-
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+#, fuzzy
+msgid "Change the settings for the summary"
 msgstr "Cambiar las propiedades de Mi Evolution"
 
 #: ui/my-evolution.xml.h:4
-msgid "_My Evolution Settings..."
-msgstr "ConfiguraciСn de _Mi Evolution..."
+#, fuzzy
+msgid "Print summary"
+msgstr "Resumen de correo"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "LeМdo"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "_ConfiguraciСn del correo..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -11617,6 +13042,28 @@ msgstr "Mensajes"
 msgid "With Category"
 msgstr "Con categorМa"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Selecciones un Zona Horaria"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "SecciСn:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Zona Horaria"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" 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 "
+"yseleccionar una zona horaria.\n"
+" Use el botСn derecho del ratСn para salir del zoom."
+
 #. 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
@@ -11711,15 +13158,15 @@ msgstr "LMMJVSD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Ahora"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Hoy"
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La fecha debe estar en el formato: %s"
@@ -11825,10 +13272,6 @@ msgstr "Mostrar todo"
 msgid "Information"
 msgstr "InformaciСn"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Aviso"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Error"
@@ -11846,11 +13289,11 @@ msgstr "Mensaje"
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: widgets/misc/e-search-bar.c:312
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Bus_car"
 
-#: widgets/misc/e-search-bar.c:407
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Buscar ahora"
 
@@ -11874,12 +13317,166 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Resumen"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#~ msgid "Send contact to other"
+#~ msgstr "Enviar el contacto a otro"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "All"
+#~ msgstr "Todo"
+
+#~ msgid "Unfiled"
+#~ msgstr "Sin archivar"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Preferencias del calendario"
+
+#~ 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."
+
+#~ msgid "This is a meeting request."
+#~ msgstr "Esta es una peticiСn de reuniСn."
+
+#~ msgid "This is one or more additions to a current meeting."
+#~ msgstr "Esto es una o mАs adiciones a su encuentro actual."
+
+#~ msgid "This is a request for the latest event information."
+#~ msgstr "Esta es una peticiСn sobre la Зltima infromaciСn del evento."
+
+#~ msgid "This is an event cancellation."
+#~ msgstr "Esta es la cancelaciСn de un evento."
+
+#~ msgid "The message is not understandable."
+#~ msgstr "Este mensaje no es comprensible."
+
+#~ 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."
+
+#~ msgid "This is a task request."
+#~ msgstr "Esta es una peticiСn de tarea."
+
+#~ msgid "This is a reply to a task request."
+#~ msgstr "Esta es una respuesta a una peticiСn de tarea."
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Este mensaje no parece haber sido creado correctamente"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Este mensaje solo contiene peticiones no soportadas."
+
+#~ msgid "The information contained in this attachment was not valid"
+#~ msgstr "La informaciСn dentro de este adjunto no era vАlida"
+
+#~ msgid "Add"
+#~ msgstr "AЯadir"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "R_esend..."
+#~ msgstr "R_eenviar..."
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Administrador de cuentas de Evolution"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "El dМa %s, %s escribiС:"
+
+#~ msgid "Updating message list"
+#~ msgstr "Actualizando la lista de mensajes"
+
+#~ msgid "My Evolution Settings"
+#~ msgstr "ConfiguraciСn de Mi Evolution"
+
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %d %B %Y"
+
+#~ msgid "Print My Evolution"
+#~ msgstr "Imprimir Mi Evolution"
+
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "La impresiСn de Mi Evolution ha fallado"
+
+#~ msgid "My Evolution"
+#~ msgstr "Mi Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Nuevo contacto"
+
+#~ msgid "Send _contact to other"
+#~ msgstr "Enviar el _contacto a otro"
+
+#~ msgid "Send _message to contact"
+#~ msgstr "Enviar un _mensaje al contacto"
+
+#~ msgid "Go to present time"
+#~ msgstr "Ir al momento actual"
+
+#~ msgid "Print calendar"
+#~ msgstr "Imprimir calendario"
+
+#~ msgid "W_ork Week"
+#~ msgstr "Semana lab_oral"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Cerrar esta cita"
+
+#~ msgid "Print S_etup"
+#~ msgstr "Configurar Impr_esiСn"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Guardar la cita y cerrar la ventana de diАlogo"
+
+#~ msgid "Help"
+#~ msgstr "Ayuda"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "E_nviar el contacto a otro..."
+
+#~ msgid "See online help"
+#~ msgstr "Ver la ayuda en lМnea"
+
+#~ msgid "Print Preview..."
+#~ msgstr "Vista previa..."
+
+#~ msgid "_Re-send Message"
+#~ msgstr "_Reenviar Mensaje"
+
+#~ msgid "Delegate Task"
+#~ msgstr "Delegar tarea"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Guardar la tarea como otra cosa"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Comenzando"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Usando el administrador de c_ontactos"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Usando el _calendario"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Usando el _correo"
+
+#~ msgid "_Index"
+#~ msgstr "_мndice"
+
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "ConfiguraciСn de _Mi Evolution..."
+
 #~ msgid "LDAP Server"
 #~ msgstr "Servidor LDAP"
 
-#~ msgid "File"
-#~ msgstr "Archivo"
-
 #~ msgid "Unknown addressbook type"
 #~ msgstr "Tipo de agenda de direcciones desconocido"
 
@@ -11935,9 +13532,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "FIXME Description help text here"
 #~ msgstr "FIXME Description help text here"
 
-#~ msgid "Addressbook Sources"
-#~ msgstr "Fuentes de la agenda de direcciones"
-
 #~ msgid "Name"
 #~ msgstr "Nombre"
 
@@ -12045,9 +13639,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "VIP"
 #~ msgstr "VIP"
 
-#~ msgid "Waiting"
-#~ msgstr "Esperando"
-
 #~ msgid "Store search as vFolder"
 #~ msgstr "Guardar la bЗsqueda como una carpeta virtual"
 
@@ -12113,6 +13704,3 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 
 #~ msgid "Receiving"
 #~ msgstr "Recibiendo"
-
-#~ msgid "Sending"
-#~ msgstr "Enviando"
diff --git a/po/fi.po b/po/fi.po
index 54fce23bd1..c81b69f473 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Jarkko Ranta <jjranta@cc.joensuu.fi> 2000-2001.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-08-11 23:25+0300\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -21,11 +22,11 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3624
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Kortti: "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +34,7 @@ msgstr ""
 "\n"
 "Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +42,7 @@ msgstr ""
 "\n"
 "  Etuliite:   "
 
-#: addressbook/backend/ebook/e-card.c:3628
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -49,7 +50,7 @@ msgstr ""
 "\n"
 "  Etunimi:    "
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -57,7 +58,7 @@ msgstr ""
 "\n"
 "  Muut nimet: "
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -65,13 +66,13 @@ msgstr ""
 "\n"
 "  Sukunimi:   "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -79,7 +80,7 @@ msgstr ""
 "\n"
 "SyntymДpДivД: "
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -87,7 +88,7 @@ msgstr ""
 "\n"
 "Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -95,13 +96,13 @@ msgstr ""
 "\n"
 "  Postilokero: "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -109,7 +110,7 @@ msgstr ""
 "\n"
 "  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3661
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -117,13 +118,13 @@ msgstr ""
 "\n"
 "  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3662
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -131,7 +132,7 @@ msgstr ""
 "\n"
 "  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3664
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -139,13 +140,13 @@ msgstr ""
 "\n"
 "  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3677
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3689
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +154,7 @@ msgstr ""
 "\n"
 "Puhelimet:\n"
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +162,7 @@ msgstr ""
 "\n"
 "Puhelin:"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +170,7 @@ msgstr ""
 "\n"
 "SДhkЖposti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -177,13 +178,13 @@ msgstr ""
 "\n"
 "SДhkЖposti:"
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -191,7 +192,7 @@ msgstr ""
 "\n"
 "AikavyЖhyke: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -199,19 +200,19 @@ msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: addressbook/backend/ebook/e-card.c:3756
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3769
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -219,7 +220,7 @@ msgstr ""
 "\n"
 "  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3770
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -227,7 +228,7 @@ msgstr ""
 "\n"
 "  YksikkЖ: "
 
-#: addressbook/backend/ebook/e-card.c:3771
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -235,7 +236,7 @@ msgstr ""
 "\n"
 "  YksikkЖ2: "
 
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -243,7 +244,7 @@ msgstr ""
 "\n"
 "  YksikkЖ3: "
 
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -251,7 +252,7 @@ msgstr ""
 "\n"
 "  YksikkЖ4: "
 
-#: addressbook/backend/ebook/e-card.c:3777
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -259,7 +260,7 @@ msgstr ""
 "\n"
 "RyhmДt: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -275,13 +276,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3791
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3794
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -289,11 +290,11 @@ msgstr ""
 "\n"
 "Julkinen avain: "
 
-#: addressbook/backend/ebook/e-card.c:4066
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4074
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -302,7 +303,7 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/conduit/address-conduit.c:1100
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
@@ -318,20 +319,20 @@ msgstr "Kohdistimen lataaminen epДonnistui\n"
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -379,6 +380,38 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
+msgstr "Kontaktit"
+
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "Folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Uusi kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Uusi kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "_Kontaktiluettelo"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "_Kontaktiluettelo"
+
 #: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
 msgstr "Muokkaa osoitekirjaa"
@@ -396,142 +429,148 @@ msgid "Add Addressbook"
 msgstr "LisДД osoitekirja"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "_Osoitekirjan lДhteet..."
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Advanced"
 msgstr "Edistynyt"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:7
 #: calendar/gui/dialogs/task-editor.c:151
 msgid "Basic"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:8
 msgid "De_lete"
 msgstr "_Poista"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.glade.h:9
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:10
 msgid "Search _base:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "Search s_cope: "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Server Name"
 msgstr "Palvelimen nimi"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/addressbook-config.glade.h:13
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "The information below is required in order to add an addressbook.  "
 msgstr "Allaolevat tiedot vaaditaan osoitekirjan lisДДmiseksi.  "
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "This information is not required for most ldap servers. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:17
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/addressbook-config.glade.h:18
 msgid "This is the name of the server where your addressbook is located."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/addressbook-config.glade.h:19
 msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.glade.h:20
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
 msgstr ""
 "TДtД nimeД kДytetДДn tilisi tunnistamiseksi. Se on vain sinua itseДsi varten"
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "_Account name:"
 msgstr "_Tilin nimi:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:88
-#: my-evolution/my-evolution.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_LisДД"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-#: mail/mail-config.glade.h:93 ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
+#: addressbook/gui/component/addressbook-config.glade.h:24
 msgid "_My server requires authentication"
 msgstr "Palveli_meni vaati todennuksen"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:25
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/addressbook-config.glade.h:26
 msgid "_Server name:"
 msgstr "Palvelimen _nimi: "
 
-#: addressbook/gui/component/addressbook-storage.c:135
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/addressbook.c:372
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:394
 msgid "LDAP Authentication"
 msgstr "LDAP-Todennus"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:405
 msgid "Email Address:"
 msgstr "SДhkЖpostiosoite:"
 
-#: addressbook/gui/component/addressbook.c:404
+#: addressbook/gui/component/addressbook.c:418
 msgid "Password:"
 msgstr "Salasana:"
 
-#: addressbook/gui/component/addressbook.c:467
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:474
+#: addressbook/gui/component/addressbook.c:488
 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:479
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -539,54 +578,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:501
 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:638
-#: calendar/gui/cal-search-bar.c:54
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "MikД tahansa kenttД sisДltДД"
 
-#: addressbook/gui/component/addressbook.c:639
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Nimi sisДltДД"
 
-#: addressbook/gui/component/addressbook.c:640
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "SДhkЖposti sisДltДД"
 
-#: addressbook/gui/component/addressbook.c:641
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "RyhmДt"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:642 widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
-#: addressbook/gui/component/addressbook.c:834
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "RyhmДt:"
+
+#: addressbook/gui/component/addressbook.c:912
 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
+#, fuzzy
+msgid "(none)"
+msgstr "(Ei nimeД)"
+
 #: 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:1581
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "Ensisijainen sДhkЖposti"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1582
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "SДhkЖposti 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1583
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "SДhkЖposti 3"
 
@@ -608,19 +666,19 @@ msgstr "LisДД osoite olemassaolevaan kontaktiin \"%s\""
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "LisДД kontakteihin"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr ""
 
@@ -641,10 +699,10 @@ 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:640
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Poista"
 
@@ -660,11 +718,11 @@ msgstr "LДhetД HTML-postia?"
 msgid "Unnamed Contact"
 msgstr "NimetЖn kontakti"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:484
+#: addressbook/gui/component/select-names/e-select-names.c:560
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -730,11 +788,11 @@ msgid "Details"
 msgstr "Yksityiskohtaiset"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
-msgstr ""
+#, fuzzy
+msgid "File A_s:"
+msgstr "Tiedoston tyyppi:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "General"
 msgstr "Yleiset"
 
@@ -758,180 +816,187 @@ msgstr "Puhelintyypit"
 msgid "Wants to receive _HTML mail"
 msgstr "Haluaa sДhkЖpostit HTML-muodossa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Kotisivun osoite:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Osoite..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_SyntymДpДivД:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_TyЖ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontaktit..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1472 mail/folder-browser.c:1313
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:88
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Poista"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Koko nimi..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Koti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_TehtДvДnimike:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Matkapuhelin"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Kutsumanimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Asema:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "Puoli_so:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_TДmД on postitusosoite"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Kotisivun osoite:"
+
 #: 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:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "TДmД kontakti kuuluu nДihin ryhmiin:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1539
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1540
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "TyЖ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1541
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "TyЖ 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1542
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "TyЖ/faksi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1543
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1544
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1545
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Yritys"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1546
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1547
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Koti 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1548
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1549
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1550
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Muut"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1552
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1553
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1554
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Ensisijainen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1555
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1556
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr ""
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Kansion `%s' poistaminen epДonnistui: %s"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Kontaktin pikalisДys"
@@ -941,7 +1006,7 @@ msgid "Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Koko nimi"
 
@@ -961,42 +1026,1023 @@ msgid "Address _2:"
 msgstr "Osoite _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Afghanistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "Antarctica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Suunta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "Elokuu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "vuotta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Koko"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+msgid "Benin"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+msgid "Brazil"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Tarkista osoite"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Kiinalainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Kiinalainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Kirjoita"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Kopioidaan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "M_aa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Suomi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "Yhdysvallat"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Peruuta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "Kreikkalainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Suomi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Yleiset"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+msgid "Haiti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "tuntia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Sunnuntai"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+#, fuzzy
+msgid "India"
+msgstr "Ideat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#, fuzzy
+msgid "Ireland"
+msgstr "Korealainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+#, fuzzy
+msgid "Japan"
+msgstr "Japanilainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#, fuzzy
+msgid "Jordan"
+msgstr "Korealainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Matalin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Matalin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+msgid "Liberia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Maaliskuu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+msgid "Malawi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "_Matkapuhelin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "_Matkapuhelin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Reunukset"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Toukokuu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Maanantai"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Matkapuhelin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+msgid "Myanmar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Vastaa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Seuraava sДie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Uusi kontakti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Korkeampi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "Korkeampi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minuutti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Nyt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "LiitД"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Paperi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#, fuzzy
+msgid "Pitcairn"
+msgstr "Tulosta kalenteri"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Suomi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Pysty"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "jДlkeen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Alueet"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+msgid "Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Yleiset"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+msgid "Seychelles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Tavallinen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Varjostus"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Su"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Kutsumanimi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Suomi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "NДkemДttД"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+msgid "Taiwan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "TehtДvДt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Suomi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Vastaanottaja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "TДnДДn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Ti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Turkkilainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ukrainalainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "NimetЖn viesti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Valitse nimet"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#, fuzzy
+msgid "Western Sahara"
+msgstr "LДnsieurooppalainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "NДkemДttД"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Osavaltio/lДДni:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "Po_stinumero:"
 
@@ -1087,7 +2133,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Poista"
@@ -1108,7 +2154,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1130,30 +2176,31 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "Muut kontaktit"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Muut kontaktit"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
-#: widgets/misc/e-filter-bar.c:242
+#: widgets/misc/e-filter-bar.c:243
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:258
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Etsi"
 
@@ -1267,10 +2314,10 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:1286
-#: ui/evolution-addressbook.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
@@ -1280,37 +2327,37 @@ msgid "Open"
 msgstr "Avaa"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send contact to other"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Uusi kontakti"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:674
-#: ui/evolution-addressbook.xml.h:26
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "LДhetД viesti kontaktille"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:675
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Tulosta"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:267
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Poista"
 
@@ -1327,8 +2374,8 @@ msgid "Success"
 msgstr "LДhteet"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1619
-#: shell/e-storage.c:501
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -1337,7 +2384,7 @@ msgstr "Tuntematon virhe"
 msgid "Repository offline"
 msgstr "TyЖskentele poissa linjoilta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr ""
 
@@ -1354,8 +2401,11 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "Peruutettu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1384,133 +2434,133 @@ msgid "Error removing list"
 msgstr "Virhe %s:n lataamisessa"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1159
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr "Virhe %s:n lataamisessa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "SДhkЖposti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "TyЖpuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "TyЖosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "TyЖpuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Muu osoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Osasto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Asema"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Ammatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:811
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:812
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1156
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Valmis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1188
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "Ladataan kalenteria..."
@@ -1713,8 +2763,8 @@ msgstr "Tulosta kalenteri"
 msgid "Print card"
 msgstr "Tulosta kalenteri"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 #, fuzzy
 msgid "Print envelope"
 msgstr "Tulostuksen esikatselu"
@@ -1879,31 +2929,31 @@ msgstr "Bonobon alustus ei onnistunut"
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:414
 #, 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/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
 #: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:435
 #, fuzzy, c-format
 msgid "%d"
 msgstr "d"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %e %B %Y"
@@ -1911,13 +2961,13 @@ msgstr "%A, %e %B %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:442
 #: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
 #: my-evolution/e-summary-calendar.c:240
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:579
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1954,20 +3004,20 @@ msgstr "L"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:641
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Korkea"
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:640
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:639
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Matala"
 
@@ -2002,20 +3052,13 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
-msgid "Cancelled"
-msgstr "Peruutettu"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -2055,14 +3098,13 @@ msgid "Undefined"
 msgstr "MДДrittelemДtЖn"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1404
-#: mail/mail-accounts.c:134 mail/mail-accounts.c:374
-#: mail/mail-config.glade.h:47 shell/e-shell-view.c:1380
-#: 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
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
 msgid "None"
 msgstr "MДДrittelemДtЖn"
 
@@ -2076,13 +3118,13 @@ msgstr ""
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
 #: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1279
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "KyllД"
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1280
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Ei"
 
@@ -2106,56 +3148,84 @@ msgstr "Viikko"
 msgid "Month View"
 msgstr "Kuukausi"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
 msgstr "Yhteenveto sisДltДД"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:57
 #, fuzzy
 msgid "Description contains"
 msgstr "Kuvaus:"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "Kommentti sisДltДД"
 
-#: calendar/gui/cal-search-bar.c:378
-msgid "Category:"
-msgstr "RyhmДt:"
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
 
-#. All, Unmatched, separator items
-#: calendar/gui/cal-search-bar.c:498
-msgid "All"
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "TehtДvДt"
+
+#: calendar/gui/component-factory.c:56
+msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:503
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr "Uusi t_apaaminen"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Luo uusi tehtДvД"
+
+#: calendar/gui/component-factory.c:409
 #, fuzzy
-msgid "Unfiled"
-msgstr "NimetЖn"
+msgid "New _Task"
+msgstr "Uusi tehtДvД"
 
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URI jonka kalenteri nДyttДД"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Vastaanottajat"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "NДytД asetukset"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2206,104 +3276,104 @@ msgstr "tuntia"
 msgid "minutes"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d pДivДД"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr " 1 pДivД"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d viikkoa"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr " 1 viikko"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d tuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 tunti"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minuuttia"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d sekuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " 1 sekunti"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Kirjoita viesti"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "LДhetД sДhkЖpostia"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Aja ohjelma"
 
-#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
 #: calendar/gui/dialogs/meeting-page.c:601
 #: calendar/gui/dialogs/meeting-page.c:636
 #: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1251
-#: calendar/gui/dialogs/meeting-page.c:1267
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "Muistuta minua kaikista tapaamisista"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, fuzzy
 msgid "after end of appointment"
 msgstr "Luo uusi tapaaminen"
@@ -2315,7 +3385,6 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#: calendar/gui/e-itip-control.c:298
 #, fuzzy
 msgid "Date/Time:"
 msgstr "PДivДys & Aika"
@@ -2326,7 +3395,7 @@ msgstr "Muistutukset"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -2356,7 +3425,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:113
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -2373,168 +3442,226 @@ msgid "10 minutes"
 msgstr "10 minuuttia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 tuntia (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minuuttia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 tuntia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minuuttia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minuuttia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Calendar Preferences"
-msgstr "Kalenterin asetukset"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "_Kalenterin asetukset..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "Compress weekends in month view"
-msgstr "TiivistД viikonloput"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:26
-msgid "Display"
-msgstr ""
+msgid "Create new appointments with a default _reminder"
+msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "End of day:"
-msgstr "PДivДn loppu:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "Days"
+msgstr "pДivДД"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "First day of week:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "First day of wee_k:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Fri"
-msgstr "Pe"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Perjantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Mon"
-msgstr "Ma"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#, fuzzy
+msgid "Hours"
+msgstr "tuntia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, fuzzy
+msgid "Minutes"
+msgstr "minuutti"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Maanantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Overdue tasks:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "O_verdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Sat"
-msgstr "La"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
-msgid "Show appointment end times in week and month views"
+msgid "Show appointment _end times in week and month views"
 msgstr "NДytД tapaamisten loppumisajat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #, fuzzy
-msgid "Show week numbers in date navigator"
+msgid "Show week _numbers in date navigator"
 msgstr "NДytД viikkonumerot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Start of day:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "Sta_rt of day:"
 msgstr "PДivДn alku:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Sun"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#, fuzzy
+msgid "Su_n"
 msgstr "Su"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
-msgid "Task List"
-msgstr "TehtДvДt"
+msgid "T_hu"
+msgstr "To"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Tasks due today:"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "T_ue"
+msgstr "Ti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Thu"
-msgstr "To"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Tas_ks due today:"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Torstai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Time divisions:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
 msgstr ""
+"\n"
+"AikavyЖhyke: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Mitat:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr ""
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "TyЖviikk_o"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 tuntia (am/pm)"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"AikavyЖhyke: "
+msgid "_24 hour"
+msgstr "24 tuntia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Tue"
-msgstr "Ti"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Tiistai"
+#, fuzzy
+msgid "_Compress weekends in month view"
+msgstr "TiivistД viikonloput"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Wed"
-msgstr "Ke"
+#, fuzzy
+msgid "_Display"
+msgstr "_PДivД"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Keskiviikko"
+#, fuzzy
+msgid "_End of day:"
+msgstr "PДivДn loppu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Work Week"
-msgstr "TyЖviikk_o"
+msgid "_Fri"
+msgstr "Pe"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_General"
+msgstr "Yleiset"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Piilota _poistetut viestit"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Mon"
+msgstr "Ma"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Other"
+msgstr "Muut"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Sat"
+msgstr "La"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "_Task List"
+msgstr "TehtДvДt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Wed"
+msgstr "Ke"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr "Luo uusi tapaaminen"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2599,63 +3726,58 @@ msgstr ""
 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:630 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:634 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "Valmis"
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:636 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "Valmis"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:641 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:643 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "TehtДvД - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:465
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:479
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:843 mail/mail-callbacks.c:1485
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: calendar/gui/dialogs/comp-editor.c:847 mail/mail-callbacks.c:1490
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2663,12 +3785,12 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: calendar/gui/dialogs/comp-editor.c:910 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Tallenna nimellД..."
 
-#: calendar/gui/dialogs/comp-editor.c:1063
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2729,30 +3851,6 @@ msgstr "Poistettu"
 msgid "Enter Delegate"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-#, fuzzy
-msgid "Select a Time Zone"
-msgstr "Valitse tiedosto"
-
-#: 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/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:156
 msgid "Appointment"
 msgstr "Tapaaminen"
@@ -2831,88 +3929,88 @@ msgstr "_Alkamisaika:"
 
 #: calendar/gui/dialogs/meeting-page.c:576
 #: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1179
-#: calendar/gui/dialogs/meeting-page.c:1247
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:578
 #: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1248
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "RyhmДn nimi:"
 
 #: calendar/gui/dialogs/meeting-page.c:580
 #: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1249
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "PaperilДhde:"
 
 #: calendar/gui/dialogs/meeting-page.c:582
 #: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1250
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:611
 #: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1263
+#: calendar/gui/dialogs/meeting-page.c:1267
 msgid "Chair"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:613
 #: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1181
-#: calendar/gui/dialogs/meeting-page.c:1264
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:615
 #: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1265
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:617
 #: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1266
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:663
 #: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1189
-#: calendar/gui/dialogs/meeting-page.c:1292
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 msgid "Needs Action"
 msgstr "LisДД toiminto"
 
 #: calendar/gui/dialogs/meeting-page.c:665
 #: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1293
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, fuzzy
 msgid "Accepted"
 msgstr "HyvДksy "
 
 #: calendar/gui/dialogs/meeting-page.c:667
 #: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1294
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
 #: calendar/gui/dialogs/meeting-page.c:669
 #: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1295
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1296
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Poistettu"
@@ -2928,35 +4026,35 @@ msgid "That person is already attending the meeting!"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Autopuhelin"
 
 #: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:838
-#: calendar/gui/dialogs/meeting-page.c:958
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Pakolliset tiedot"
 
 #: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Valinnaiset tiedot"
 
 #: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:916
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "LДhetetyt"
 
-#: calendar/gui/dialogs/meeting-page.c:1467
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Poista..."
@@ -3003,7 +4101,7 @@ msgid "Status"
 msgstr "Tila"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:83
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tyyppi"
@@ -3052,7 +4150,7 @@ msgstr ""
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr ""
 
@@ -3149,7 +4247,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
@@ -3240,51 +4338,53 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3378
-#: calendar/gui/e-week-view.c:3230 mail/folder-browser.c:1278
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3387
-#: calendar/gui/e-week-view.c:3239 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3389
-#: calendar/gui/e-week-view.c:3241 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:32 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3364
-#: calendar/gui/e-day-view.c:3391 calendar/gui/e-week-view.c:3217
-#: calendar/gui/e-week-view.c:3243 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "L_iitД"
 
-#: calendar/gui/e-calendar-table.c:862
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:864
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Poista tДmД tehtДvД"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:869
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista tehtДvД"
 
-#: calendar/gui/e-calendar-table.c:1129
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+msgid "Click to add a task"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:3
@@ -3324,7 +4424,11 @@ msgstr "Prioriteetti"
 msgid "Start Date"
 msgstr ""
 
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Kuvaus"
 
@@ -3367,120 +4471,228 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3357
-msgid "New _Appointment"
-msgstr "Uusi t_apaaminen"
-
-#: calendar/gui/e-day-view.c:3359 calendar/gui/e-week-view.c:3212
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr "Uusi koko pД_ivДn tapahtuma"
 
-#: calendar/gui/e-day-view.c:3369 calendar/gui/e-week-view.c:3222
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3371 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 msgid "_Go to Date..."
 msgstr "Siirry _pДivДДn..."
 
-#: calendar/gui/e-day-view.c:3380 calendar/gui/e-week-view.c:3232
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 msgid "_Delete this Appointment"
 msgstr "P_oista tДmД tapaaminen"
 
-#: calendar/gui/e-day-view.c:3399 calendar/gui/e-week-view.c:3257
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3401 calendar/gui/e-week-view.c:3259
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3403 calendar/gui/e-week-view.c:3261
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Valinnaiset tiedot"
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is a meeting request."
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:637
+#, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Valitse toiminto"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Hae viestistД"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:715 calendar/gui/e-itip-control.c:755
-#: calendar/gui/e-itip-control.c:783
-msgid "The message is not understandable."
-msgstr "Viesti ei ole ymmДrrettДvissД."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "TehtДvДt"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:752
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Vastaa"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:691
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Peruuta operaatio"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Hae viestistД"
+
+#: calendar/gui/e-itip-control.c:713
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:837
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "LДhteen tiedot"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:856
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:880
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:992
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Edellinen viesti"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1018
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Valmis"
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "En pystynyt poistamaan kohtaa kalenteritiedostostasi!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "Valmis"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "LДhetetty"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3528,16 +4740,16 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3210 calendar/gui/e-week-view.c:3248
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/gnome-cal.c:1248
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1259
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3598,7 +4810,7 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3754,12 +4966,6 @@ msgstr "Pe"
 msgid "Sa"
 msgstr "La"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-shortcuts.c:1025
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "TehtДvДt"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3793,9 +4999,8 @@ msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1854 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -3917,8 +5122,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:663
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:705
@@ -3931,7 +5136,11 @@ msgid ""
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:967
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -3992,6 +5201,7 @@ msgid "Unable to process spool folder"
 msgstr ""
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiД %d (%d%%)"
 
@@ -4238,7 +5448,7 @@ msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4368,7 +5578,7 @@ msgstr "Tuntematon todennustila."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "Salasana"
 
@@ -4398,37 +5608,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4492,7 +5702,7 @@ msgstr "Viestin salauksen purkaminen epДonnistui."
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4500,7 +5710,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4584,21 +5794,21 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr "EtsitДДn muuttuneita viestejД"
 
-#: camel/providers/imap/camel-imap-folder.c:1478
-#: camel/providers/imap/camel-imap-folder.c:1902
+#: camel/providers/imap/camel-imap-folder.c:1491
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "TДtД viestiД ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:1620
-#: camel/providers/imap/camel-imap-folder.c:1701
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1626
+#: camel/providers/imap/camel-imap-folder.c:1640
 msgid "Scanning for new messages"
 msgstr "EtsitДДn uusia viestejД"
 
-#: camel/providers/imap/camel-imap-folder.c:1935
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -4615,7 +5825,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:653
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -4653,7 +5863,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
@@ -4664,7 +5874,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
@@ -4676,12 +5886,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:327
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1023
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4922,14 +6132,15 @@ msgstr ""
 #. 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 ""
+#, fuzzy
+msgid "Summarizing folder"
+msgstr "Synkronoidaan kansiota"
 
 #: 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 ""
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
+msgstr "Hakemistoa %s ei voitu uudelleennimetД seuraavaksi: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
 #: camel/providers/local/camel-spool-summary.c:426
@@ -4938,25 +6149,23 @@ 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 ""
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
+msgstr "Kansion hakeminen ei onnistu: %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:1549
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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 ""
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
+msgstr "Hakemistoa %s ei voitu uudelleennimetД seuraavaksi: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -5058,6 +6267,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5146,35 +6366,35 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:193
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Uusien viestien haku POP-palvelimelta epДonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:239
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:332
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Viestin hakeminen epДonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:348
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "ViestiД ei saatu POP-palvelimelta %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:375
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestiД %d"
@@ -5192,7 +6412,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:51
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5271,7 +6491,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5323,7 +6543,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:63
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5331,122 +6551,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "VДliaikainen todennusvirhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5454,125 +6674,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:583
 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:589
+#: camel/providers/smtp/camel-smtp-transport.c:590
 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:594 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "LДhetetДДn viestiД"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:606
 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:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:760
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:766
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:969
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:988
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5602,7 +6822,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "liite"
 
@@ -5693,7 +6913,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "LiitД tiedosto"
 
-#: composer/e-msg-composer.c:687
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5702,7 +6922,7 @@ msgstr ""
 "Tiedoston %s poistaminen epДonnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5711,58 +6931,58 @@ msgstr ""
 "Tiedoston %s lukeminen epДonnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:890
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Tallenna nimellД..."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr "Varoitus!"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:943
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:990
 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:1064
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1078
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5771,15 +6991,16 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1193
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution on lЖytДnyt tallentamattomia tiedostoja edelliseltД \n"
 "istunnolta. Haluatko koittaa palauttaa niitД?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5789,24 +7010,24 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1348 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1520
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "LiitД tiedosto"
 
-#: composer/e-msg-composer.c:1894 composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2384
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Viestin kirjoitusikkunan luominen epДonnistui."
 
@@ -5832,55 +7053,101 @@ msgstr ""
 msgid "calendar information"
 msgstr ""
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "sisДltДД"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "ei sisДllД"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "ei sisДllД"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Nimi sisДltДД"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Kuvaus:"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Nimi sisДltДД"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Nimi sisДltДД"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "ei sisДllД"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr ""
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr ""
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5888,13 +7155,13 @@ 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
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -5984,7 +7251,7 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "nyt"
 
@@ -5996,11 +7263,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr ""
 
@@ -6020,7 +7291,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:796
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr ""
 
@@ -6032,7 +7303,7 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:197
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6080,30 +7351,22 @@ msgid "outgoing"
 msgstr "lДhtevДt"
 
 #: filter/filter.glade.h:1
-msgid "Add"
-msgstr "LisДД"
-
-#: filter/filter.glade.h:3
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr ""
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "LДhtevДt"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr ""
 
@@ -6221,7 +7484,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1070
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "LДhettДjД"
 
@@ -6343,14 +7606,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Tuo"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr ""
 
@@ -6378,11 +7640,11 @@ msgstr ""
 "Evolution lЖysi GnomeCardin tiedostoja.\n"
 "Haluatko tuoda nДmД Evolutioniin?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Asetukset"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6438,166 +7700,180 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Suodata postituslistan mukaan"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr "TДmД kansio ei voi sisДltДД viestejД."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr "Muuta tДmДn kansion ominaisuuksia"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Seuraava viesti"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Seuraava viesti"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionin sДhkЖpostikomponentin alustus epДonnistui."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Kansion \"%s\" ominaisuudet"
 
-#: mail/folder-browser-ui.c:258
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:232 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "VДliaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/folder-browser.c:900
+#: mail/folder-browser.c:909
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "_Luo viestistД suodatin"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Suodata _lДhettДjДn mukaan"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1280
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "R_esend..."
-msgstr "LДhetД uudelleen"
+msgid "_Edit as New Message..."
+msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:96
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Tallenna _nimellД..."
 
-#: mail/folder-browser.c:1284 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Vastaa lДhettДjДlle"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_VДlitД"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr "Merkitse tДrkeДks_i"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_SiirrД kansioon..."
 
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "LisДД lДhettДjД osoitekirjaan"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "_Luo viestistД sДДntЖ"
 
-#: mail/folder-browser.c:1487
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:1488
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:1491
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-info.c:60
+#: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "Valinnaiset tiedot"
@@ -6659,15 +7935,15 @@ msgid "Evolution News Editor"
 msgstr "Evolutionin uutismuokkain"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:986
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-account-gui.c:992
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6677,38 +7953,43 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (oletus)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "дlД kДytД"
 
-#: mail/mail-accounts.c:176
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "KДytД"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tДmДn tilin?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr "дlД poista"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr "Poistetaanko tili todella?"
 
-#: mail/mail-accounts.c:495 mail/mail-accounts.c:499
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "Haluatko varmasti poistaa tДmДn keskusteluryhmДtilin?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:741
-msgid "Evolution Account Manager"
-msgstr "Evolutionin tilienhallinta"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "_SДhkЖpostiasetukset..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6734,7 +8015,7 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr "LisДД suodatussДДntЖ"
 
-#: 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"
@@ -6746,23 +8027,23 @@ msgstr ""
 "vastaanottaa tai kirjoittaa viestejД.\n"
 "Haluatko tehdД asetukset nyt?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6770,7 +8051,7 @@ msgstr ""
 "ViestillД ei ole aihetta.\n"
 "LДhetetДДnkЖ toedella?"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6778,38 +8059,37 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "Sinuun tulee mДДritellД vastaanottajat ennen tДmДn viestin lДhettДmistД."
 
-#: mail/mail-callbacks.c:389
+#: mail/mail-callbacks.c:390
 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:632
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "%s %s kirjoitti:"
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "VДlitetty viesti:\n"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "SiirrД viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1383
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6817,7 +8097,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejД."
 
-#: mail/mail-callbacks.c:1417
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6825,87 +8105,121 @@ msgstr ""
 "Voit lДhettДД uudelleen vain\n"
 "\"LДhetetyt\"-kansiossa olevia viestejД."
 
-#: mail/mail-callbacks.c:1429
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Haluatko todella lДhettДД kaikki %d viestiД uudelleen?"
 
-#: mail/mail-callbacks.c:1450
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "Ei viestejД valittuna"
 
-#: mail/mail-callbacks.c:1534
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimellД..."
 
-#: mail/mail-callbacks.c:1536
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimellД..."
 
-#: mail/mail-callbacks.c:1759
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Varoitus"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "дlД kysy tДtД enДД uudelleen"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1769
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:1815
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:1861
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epДonnistui"
 
-#: mail/mail-callbacks.c:1945
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:463
-msgid "Evolution Account Wizard"
-msgstr ""
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-config.c:1570
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Saapuneet"
+
+#: mail/mail-config.c:1809
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1641 mail/mail-config.c:1644
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr ""
 
@@ -6991,11 +8305,15 @@ msgstr ""
 msgid "Digital IDs..."
 msgstr ""
 
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr ""
+
 #: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Luonnokset"
 
@@ -7007,298 +8325,305 @@ msgstr "Luonnoskansio:"
 msgid "E_nable"
 msgstr "KД_ytД"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Tallenna tiedosto uudella nimellД"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Muokkaa..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "KДytД"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "HTML-allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Tee tДstД _oletustilini"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr "Viestin _esikatselu on kДytЖssД oletuksena"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "NNTP-palvelin"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Uutiset"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Valitse vДri"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Otetaan vastaan sДhkЖpostia"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Turvallisuus"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Valitse PGP-ohjelma"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "LДhetetДДn sДhkЖpostia"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "LДhtevД posti"
 
-#: mail/mail-config.glade.h:71 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "LДhetetyt"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "LДhetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "LДhetettyjen kansio:"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "LДhde"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "LДhteen tiedot"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "LДhteet"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr "KДytД salattua yhteyttД (_SSL)"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
 msgstr "Tar_kista tuetut tavat"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
 msgstr "SДhkЖpostiosoit_e:"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
 msgstr "Tyhj_ennД roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:98
 msgid "_Full Name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr "_Korosta lainaukset vДrillД"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
 msgstr "_IsДntДpalvelin:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 msgid "_Organization:"
 msgstr "_Organisaatio:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr "_PGP-ohjelman polku:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Muista tДmД salasana"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "LДhetД sДhkЖpostit oletuksena _HTML-muodossa."
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "Allekirjoitu_stiedosto:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "KДyttДjДt_unnus:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "sekuntia."
 
@@ -7338,76 +8663,82 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Ladataan viestin sisДltЖД"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr "Tallenna linkki nimellД"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 msgid "Save Image as..."
 msgstr "Tallenna kuva nimellД..."
 
-#: mail/mail-folder-cache.c:146
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:152 mail/mail-folder-cache.c:159
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:153
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:162
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Poistettu"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr "%d lДhettДmДtЖntД"
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr "%d yhteensД"
@@ -7498,17 +8829,22 @@ msgstr ""
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:459
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Ei kyseistД viestiД: %s"
+
+#: mail/mail-local.c:460
 #, c-format
-msgid "Opening '%s'"
+msgid "Registering '%s'"
 msgstr ""
 
-#: mail/mail-local.c:749
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:870
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7576,7 +8912,7 @@ msgstr "LДhetetДДn viestiД %d / %d"
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Valmis."
 
@@ -7608,7 +8944,7 @@ msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Roskakori"
 
@@ -7616,7 +8952,7 @@ msgstr "Roskakori"
 msgid "Forwarded messages"
 msgstr "VДlitetyt viestit"
 
-#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
@@ -7626,65 +8962,75 @@ msgstr ""
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Poistetaan kansiota %s"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1599
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synkronoidaan kansiota"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1684
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiД %s"
 
-#: mail/mail-ops.c:1751
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Haetaan %d viesti(Д)"
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan %d viesti(Д)"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2131
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
@@ -7697,31 +9043,31 @@ msgstr "_Etsi"
 msgid "(Untitled Message)"
 msgstr "(NimetЖn viesti)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 msgid "Untitled Message"
 msgstr "NimetЖn viesti"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 msgid "Empty Message"
 msgstr "TyhjД viesti"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "Hae viestistД"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "Kirjainkoolla on merkitystД"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Etsi:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Osumia:"
 
@@ -7741,7 +9087,7 @@ msgstr "PДivitetДДn..."
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Peruutettu."
 
@@ -7763,15 +9109,15 @@ msgstr "VДlitetty viesti - %s"
 msgid "Forwarded message"
 msgstr "VДlitetty viesti"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 msgid "Forwarded Message"
 msgstr "VДlitetty viesti"
 
-#: mail/mail-vfolder.c:282
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr ""
 
@@ -7784,63 +9130,59 @@ msgstr "(Ei aihetta)"
 msgid "%s - Message"
 msgstr "%s - Viesti"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "NДhty"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "NДkemДttД"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:632
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:633
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:637
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "TДnДДn %l:%M %p"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:929
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:931
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
@@ -7848,10 +9190,6 @@ msgstr "%b %d %Y"
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
-#: mail/message-list.c:2324
-msgid "Updating message list"
-msgstr "PДivitetДДn viestiluetteloa"
-
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
@@ -7864,39 +9202,76 @@ msgstr "Otettu vastaan"
 msgid "Size"
 msgstr "Koko"
 
-#: mail/subscribe-dialog.c:166
+#: mail/subscribe-dialog.c:174
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:267
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:269
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Kansio"
 
-#: mail/subscribe-dialog.c:1432
+#: mail/subscribe-dialog.c:1490
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/subscribe-dialog.c:1489
+#: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
+#: mail/subscribe-dialog.glade.h:1
+msgid " _Refresh List "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Paikalliset kansiot"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "NДytД toinen kansio"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Kuvaus:"
+
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Tilaa"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Poista tilaus"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -7905,7 +9280,11 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr ""
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
@@ -7925,33 +9304,43 @@ msgstr ""
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "Postin yhteenveto"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:881
+#: my-evolution/e-summary-preferences.c:889
 msgid "Name:"
 msgstr "Nimi:"
 
-#: my-evolution/e-summary-preferences.c:1403
-msgid "My Evolution Settings"
-msgstr "Evolutionin aseukseni"
+#: my-evolution/e-summary-preferences.c:1421
+#, fuzzy
+msgid "Summary Settings"
+msgstr "Yhteenveto sisДltДД"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -7961,6 +9350,11 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Virhe ladattaessa RDF:ДД</b>"
 
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "_Uusi kansio"
+
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr "Ei tehtДviД"
@@ -7969,30 +9363,74 @@ msgstr "Ei tehtДviД"
 msgid "My Weather"
 msgstr "SДДtiedot"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>SДДtietopalvelimeen ei saatu yhteyttД</b></dd>"
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "SДДtiedot"
+
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Alueet"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
-msgstr ""
+#, fuzzy
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %d, %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Print Summary"
+msgstr "Kuvaus"
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
-msgstr ""
+#, fuzzy
+msgid "Printing of Summary failed"
+msgstr "Viestin tulostus epДonnistui"
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Kirjasinlajit"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "SiirretДДn"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Suodattimet"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "Suodattimet"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr ""
@@ -9165,10 +10603,6 @@ msgstr "Paikalliset kansiot"
 msgid "All news _feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1024
-msgid "Calendar"
-msgstr "Kalenteri"
-
 #: my-evolution/my-evolution.glade.h:7
 msgid "How many days should the calendar display at once?"
 msgstr "Kuinka monta pДivДД kalenterissa nДytetДДn kerrallaan?"
@@ -9290,7 +10724,15 @@ msgstr "NДytД yksityiskohdat"
 msgid "Cancel Operation"
 msgstr "Peruuta operaatio"
 
-#: shell/e-local-storage.c:551
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr "Saapuneet"
+
+#: shell/e-local-storage.c:178
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
@@ -9343,7 +10785,7 @@ msgid ""
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9351,7 +10793,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9360,7 +10802,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9380,48 +10822,55 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Kopioi kansio"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "SiirД kansio"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Poista kansio '%s'"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:377
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Haluatko todella poistaa kansion '%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:452
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "NimeД kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:456 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "NimeД uudelleen"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:464
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Kansion nimi:"
@@ -9447,11 +10896,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Uusi..."
 
-#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(NimetЖn)"
 
@@ -9481,7 +10930,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9524,7 +10973,7 @@ msgstr ""
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
@@ -9532,11 +10981,11 @@ msgstr "Valitse tiedosto"
 msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
@@ -9544,105 +10993,127 @@ msgstr ""
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Evolutionin sДhkЖpostikomponentin alustus epДonnistui."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug budday ei lЖytynyt $PATH:istasi."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 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:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Siirry kansioon..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:702
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr "TyЖskentele linjoilla"
 
-#: shell/e-shell-view-menu.c:715 shell/e-shell-view-menu.c:728
-#: ui/evolution.xml.h:35
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "TyЖskentele poissa linjoilta"
 
-#: shell/e-shell-view.c:177
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1385
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1387
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1425
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1432
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1438
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:491
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1405
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell.c:1609 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1611
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1613
+#: shell/e-shell.c:1646
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1615
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1617 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -9733,7 +11204,7 @@ msgstr "Oikotien uusi nimi:"
 msgid "Open the folder linked to this shortcut"
 msgstr "Avaa tДmДn oikotien osoittama kansio"
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Avaa uudessa ikkunassa"
 
@@ -9749,74 +11220,69 @@ msgstr "NimeД tДmД oikotie uudelleen"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista tДmД oikotie oikotiepalkista"
 
-#: shell/e-shortcuts.c:620
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Virhe tallennettaessa oikoteitД."
 
-#: shell/e-shortcuts.c:1019
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr "Oikotiet"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-shortcuts.c:1023
-msgid "Inbox"
-msgstr "Saapuneet"
-
-#: shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Kontaktit"
-
-#: shell/e-storage-set-view.c:1464 shell/e-summary-storage.c:78
-msgid "My Evolution"
-msgstr ""
-
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Ei nimeД)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Ei virhettД"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
+#: shell/e-storage.c:511
+msgid "The specified folder cannot be modified or removed"
+msgstr ""
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
 #: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
@@ -9849,17 +11315,28 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr ""
+#, fuzzy
+msgid "Evolution Import Assistant"
+msgstr "Evolutionin asennus"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
+msgstr "Evolutionin asennus"
+
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
 msgstr ""
 
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Valitse tiedosto"
+
 #: 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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -9876,7 +11353,7 @@ msgid "Don't ask me again"
 msgstr "дlД kysy tДtД enДД uudelleen"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #: shell/main.c:95
@@ -9904,29 +11381,29 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:154
+#: shell/main.c:173
 msgid "Cannot access the Evolution shell."
 msgstr ""
 
-#: shell/main.c:163
+#: shell/main.c:184
 #, c-format
 msgid "Cannot initialize the Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:221
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:222
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:261
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijДrjestelmДn alustus epДonnistui"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopioi"
 
@@ -9942,11 +11419,11 @@ msgstr "Luo uusi kontakti"
 msgid "Create new contact list"
 msgstr "Luo uusi kontaktiluettelo"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
@@ -9954,89 +11431,93 @@ msgstr "Leikkaa valinta"
 msgid "Delete selected contacts"
 msgstr "Poista valitut kontaktit"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Uusi kontakti"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "New List"
 msgstr "Uusi luettelo"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "LiitД"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "LiitД leikepЖytД"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Esikatselee tulostettavia kontakteja"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Tulosta valitut kontaktit"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Valitse kaikki kontaktit"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Send _contact to other"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send _message to contact"
-msgstr "LДhetД _viesti kontaktille"
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "LДhetД _viesti kontaktille..."
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send a mess to the selected contacts."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "LДhetД viesti kontaktille"
+
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "PysДytД"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "PysДytД lataaminen"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:29
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "_Osoitekirjan lДhteet..."
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Kontakti"
 
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact List"
 msgstr "_Kontaktiluettelo"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
-#: ui/evolution-contact-editor.xml.h:16 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Kontaktit..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "T_ulosta..."
 
@@ -10045,16 +11526,18 @@ msgid "_Save as VCard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:38
-msgid "_Search for contacts"
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Etsi kontakteja"
 
 #: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "Valitse k_aikki"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "T_yЖkalut"
 
@@ -10063,108 +11546,130 @@ 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"
-msgstr "Luo uusi t_apaaminen"
+#, fuzzy
+msgid "Create a New _Task"
+msgstr "Luo uusi tehtДvД"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Luo uusi tapaaminen"
+msgid "Create a _New Appointment"
+msgstr "Luo uusi t_apaaminen"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "Luo uusi koko pДivДn tapahtuma"
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Day"
+msgstr "_PДivД"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Poista tДmД tapaaminen"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Siirry"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
-msgstr ""
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
+msgstr "VДlitД"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Siirry nykyiseen aikaan"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Siirry tДhДn pДivДДn"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "_Kuukausi"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Uusi tehtДvД"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Esikatselee tulostettavaa kalenteria"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Tulosta kalenteri"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Tulostuksen esikatselu"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Print this calendar"
 msgstr "Tulosta tДmД kalenteri"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "NДytД 1 pДivД"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "NДytД 1 kuukausi"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "NДytД 1 viikko"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "NДytД tyЖviikko"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "TyЖviikk_o"
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "Week"
+msgstr "_Viikko"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "T_apaaminen..."
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "_Kalenterin asetukset..."
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Day"
-msgstr "_PДivД"
-
-#: ui/evolution-calendar.xml.h:34
-msgid "_Month"
-msgstr "_Kuukausi"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Pakolliset tiedot"
 
-#: ui/evolution-calendar.xml.h:38
-msgid "_Week"
-msgstr "_Viikko"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_TehtДvД"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10175,15 +11680,16 @@ msgid "Close"
 msgstr "Sulje"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Sulje tДmД tapaaminen"
+#, fuzzy
+msgid "Close this item"
+msgstr "Poista tДmД kohta"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Poista tДmД tapaaminen"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Poista tДmД kohta"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr ""
 
@@ -10191,89 +11697,58 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Esikatsele tulostettavaa kohtaa"
 
-#: 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
-msgid "Print S_etup"
-msgstr "Tulostusasetuks_et"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 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-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Tallenna"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Tallenna luettelo ja sulje ikkuna"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 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:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Poista tДmД kohta"
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Ohje"
-
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:244
-msgid "Save"
-msgstr "Tallenna"
-
-#: ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Tallenna _nimellД..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Tallenna kontakti ja sulje ikkuna"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "LДhetД _viesti kontaktille..."
-
-#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
@@ -10304,19 +11779,19 @@ msgstr ""
 msgid "Cancel Mee_ting"
 msgstr "Peruuta _tapaaminen"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10328,7 +11803,7 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr ""
 
@@ -10345,37 +11820,38 @@ msgid "Cancel the current mail operation"
 msgstr "Peruuta nykyinen postioperaatio"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Kirjoita"
-
-#: ui/evolution-mail-global.xml.h:4
 msgid "Compose _New Message"
 msgstr "Kirjoita uusi viesti"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "_TyhjennД roskakori"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "_Unohda salasanat"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Seuraava viesti"
+
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
@@ -10432,96 +11908,101 @@ msgstr ""
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Kopioi valitut viestit"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Leikkaa"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Leikkaa valitut viestit"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Piilota valitut vi_estit"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Piilota _poistetut viestit"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Piilota _luetut viestit"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Merkitse ka_ikki luetuksi"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Merkitse kaikki nДkyvДt viestit luetuiksi"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "LiitД viesti leikepЖydДlle"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Valitse _sДie"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Valitse kaikki nДkyvДt viestit"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "NДytД piil_otetut viestit"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "NДytД viestit jotka on vДliaikaisesti piilotettu"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Piilota kaikki luetut viestit vДliaikaisesti"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Piilota valitut viestit vДliaikaisesti"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "SДikeistetty viesti-ikkuna"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:25
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Kansio"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_KДДnnД valinta"
 
@@ -10742,7 +12223,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "Avaa valittu viesti muokkaimeen uudelleenlДhettДmistД varten"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiД"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10761,38 +12243,34 @@ msgstr "Edellinen viesti"
 msgid "Previous Unread Message"
 msgstr "Edellinen lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "Tulosta viesti..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "Tulostuksen esikatselu..."
-
-#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Tulosta tДmД viesti"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "_Etsi viestiД"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "Tallenna viesti tiedostona"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -10845,30 +12323,26 @@ msgstr ""
 msgid "_Create Filter From Message"
 msgstr "_Luo viestistД suodatin"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr "_VДlitetД viesti"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "_SiirrД kansioon"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "_Avaa viesti"
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "_Re-send Message"
-msgstr "LДhetД viesti _uudelleen"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Sulje tДmД ikkuna"
@@ -10876,12 +12350,12 @@ msgstr "Sulje tДmД ikkuna"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Sulje"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_NДytД"
 
@@ -11072,7 +12546,7 @@ msgstr "_Vastausosoite-kenttД"
 msgid "_Security"
 msgstr "Turvalli_suus"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Ohje"
 
@@ -11105,14 +12579,27 @@ msgid "Unsubscribe"
 msgstr "Poista tilaus"
 
 #: ui/evolution-task-editor.xml.h:1
+msgid "Assign Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Peruuta tehtДvД"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
-msgstr "Delegoi tehtДvД"
+#: ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Cancel this task"
+msgstr "Peruuta tehtДvД"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr ""
 
@@ -11120,39 +12607,28 @@ msgstr ""
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "Kopioi valittu tehtДvД"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Luo uusi tehtДvД"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "Leikkaa valittu tehtДvД"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtДvДt"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr "Uusi tehtДvД"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "LiitД tehtДvД leikepЖydДltД"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr "Tallenna tehtДvД jossain muussa muodossa"
-
 #: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings"
+#, fuzzy
+msgid "Tasks Settings..."
 msgstr "TehtДvДn asetukset"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_TehtДvД"
 
@@ -11209,133 +12685,130 @@ msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
 #: ui/evolution.xml.h:16
-msgid "Getting _Started"
-msgstr ""
-
-#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "SiirrД tДmД kansio toiseen paikkaan"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "Avaa uudessa _ikkunassa"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Avaa valittu kansio uudessa ikkunassa"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "LДhetД virheraportti"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "LДhetД _virheraportti"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
 msgstr "LДhetД virheraportti kДyttДen Bug Buddy:a"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "MДДritД"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "MДДritД, nДytetДДnkЖ kansiopalkki"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "MДДritД, nДytetДДnkЖ oikotiepalkki"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "MДДritД, tyЖskennellДДnkЖ poissa linjoilta."
 
-#: ui/evolution.xml.h:31
-msgid "Using the C_ontact Manager"
-msgstr ""
-
-#: ui/evolution.xml.h:32
-msgid "Using the _Calendar"
-msgstr "_Kalenterin kДyttЖ"
-
-#: ui/evolution.xml.h:33
-msgid "Using the _Mailer"
-msgstr ""
-
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:46
-msgid "_Import file..."
-msgstr ""
-
-#: ui/evolution.xml.h:47
-msgid "_Index"
-msgstr ""
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
+msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_SiirrД..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_NimeД uudelleen..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Oikotie"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr ""
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "Muuta tДmДn kansion nimeД"
 
 #: ui/my-evolution.xml.h:4
-msgid "_My Evolution Settings..."
+#, fuzzy
+msgid "Print summary"
+msgstr "Postin yhteenveto"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Lue"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
 msgstr ""
 
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "_SДhkЖpostiasetukset..."
+
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Osoitekortit"
@@ -11368,6 +12841,30 @@ msgstr "Viestit"
 msgid "With Category"
 msgstr "RyhmДn mukaan"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Valitse tiedosto"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "KДДnnД valinta"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"AikavyЖhyke: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11462,15 +12959,15 @@ msgstr "MTKTPLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Nyt"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "TДnДДn"
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
@@ -11560,6 +13057,16 @@ msgstr ""
 msgid "Save Search"
 msgstr "Tallenna haku"
 
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Tallenna haku"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Kalenteri"
+
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "NДytД kaikki"
@@ -11568,10 +13075,6 @@ msgstr "NДytД kaikki"
 msgid "Information"
 msgstr "Tiedoksi"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Varoitus"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Virhe"
@@ -11589,11 +13092,11 @@ msgstr "Viesti"
 msgid "Don't show this message again."
 msgstr "дlД nДytД tДtД viestiД uudelleen."
 
-#: widgets/misc/e-search-bar.c:312
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_Etsi"
 
-#: widgets/misc/e-search-bar.c:407
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Etsi nyt"
 
@@ -11617,6 +13120,91 @@ msgstr "init_corba(): GNOME:n alustus epДonnistui"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus epДonnistui"
 
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Kuvaus"
+
+#~ msgid "USA"
+#~ msgstr "Yhdysvallat"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Peruutettu"
+
+#, fuzzy
+#~ msgid "Unfiled"
+#~ msgstr "NimetЖn"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Kalenterin asetukset"
+
+#~ msgid "The message is not understandable."
+#~ msgstr "Viesti ei ole ymmДrrettДvissД."
+
+#~ msgid "Add"
+#~ msgstr "LisДД"
+
+#~ msgid "Edit"
+#~ msgstr "Muokkaa"
+
+#, fuzzy
+#~ msgid "R_esend..."
+#~ msgstr "LДhetД uudelleen"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Evolutionin tilienhallinta"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "%s %s kirjoitti:"
+
+#~ msgid "Updating message list"
+#~ msgstr "PДivitetДДn viestiluetteloa"
+
+#~ msgid "My Evolution Settings"
+#~ msgstr "Evolutionin aseukseni"
+
+#~ msgid "New contact"
+#~ msgstr "Uusi kontakti"
+
+#~ msgid "Send _message to contact"
+#~ msgstr "LДhetД _viesti kontaktille"
+
+#~ msgid "Go to present time"
+#~ msgstr "Siirry nykyiseen aikaan"
+
+#~ msgid "Print calendar"
+#~ msgstr "Tulosta kalenteri"
+
+#~ msgid "W_ork Week"
+#~ msgstr "TyЖviikk_o"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Sulje tДmД tapaaminen"
+
+#~ msgid "Print S_etup"
+#~ msgstr "Tulostusasetuks_et"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+
+#~ msgid "Help"
+#~ msgstr "Ohje"
+
+#~ msgid "Print Preview..."
+#~ msgstr "Tulostuksen esikatselu..."
+
+#~ msgid "_Re-send Message"
+#~ msgstr "LДhetД viesti _uudelleen"
+
+#~ msgid "Delegate Task"
+#~ msgstr "Delegoi tehtДvД"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Tallenna tehtДvД jossain muussa muodossa"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "_Kalenterin kДyttЖ"
+
 #~ msgid "Category contains"
 #~ msgstr "RyhmД sisДltДД"
 
@@ -11646,9 +13234,6 @@ msgstr "init_bonobo(): Bonobon alustus epДonnistui"
 #~ msgid "Holiday"
 #~ msgstr "LomapДivД"
 
-#~ msgid "Ideas"
-#~ msgstr "Ideat"
-
 #~ msgid "Key Customer"
 #~ msgstr "Avainasiakas"
 
diff --git a/po/fr.po b/po/fr.po
index dba4a9b60c..2e322c21b8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,10 +3,11 @@
 # Vincent Renardias <vincent@debian.org>, 2000.
 # Christophe Merlet (RedFox) <redfox@eikonex.org>, 2000-2001.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -22,11 +23,11 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Carte : "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -34,7 +35,7 @@ msgstr ""
 "\n"
 "Nom : "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -42,7 +43,7 @@ msgstr ""
 "\n"
 "  PrИfixe :     "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -50,7 +51,7 @@ msgstr ""
 "\n"
 "  DonnИ :      "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -58,7 +59,7 @@ msgstr ""
 "\n"
 "  Additionnel : "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -66,7 +67,7 @@ msgstr ""
 "\n"
 "  Famille :     "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -74,7 +75,7 @@ msgstr ""
 "\n"
 "  Suffixe :     "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -82,7 +83,7 @@ msgstr ""
 "\n"
 "Date de naissance : "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -90,7 +91,7 @@ msgstr ""
 "\n"
 "Addresse :"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -98,7 +99,7 @@ msgstr ""
 "\n"
 "  Boite postale :  "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -106,7 +107,7 @@ msgstr ""
 "\n"
 "  Ext :         "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -114,7 +115,7 @@ msgstr ""
 "\n"
 "  Rue :      "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -122,7 +123,7 @@ msgstr ""
 "\n"
 "  Ville :        "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -130,7 +131,7 @@ msgstr ""
 "\n"
 "  RИgion :      "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -138,7 +139,7 @@ msgstr ""
 "\n"
 "  Code postal : "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -146,7 +147,7 @@ msgstr ""
 "\n"
 "  Pays :     "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -154,7 +155,7 @@ msgstr ""
 "\n"
 "DИnomination : "
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -162,7 +163,7 @@ msgstr ""
 "\n"
 "TИlИphones :\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -170,7 +171,7 @@ msgstr ""
 "\n"
 "TИlИphone :"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -178,7 +179,7 @@ msgstr ""
 "\n"
 "Adresse Иlectronique :\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -186,7 +187,7 @@ msgstr ""
 "\n"
 "Adresse Иlectronique 2 :"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -194,7 +195,7 @@ msgstr ""
 "\n"
 "Messager : "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -202,7 +203,7 @@ msgstr ""
 "\n"
 "Fuseau horaire : "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -210,7 +211,7 @@ msgstr ""
 "\n"
 "Situation gИographique : "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -218,7 +219,7 @@ msgstr ""
 "\n"
 "Profession : "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -226,7 +227,7 @@ msgstr ""
 "\n"
 "Org : "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -234,7 +235,7 @@ msgstr ""
 "\n"
 "  Nom :  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -242,7 +243,7 @@ msgstr ""
 "\n"
 "  UnitИ :  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -250,7 +251,7 @@ msgstr ""
 "\n"
 "  UnitИ 2 : "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -258,7 +259,7 @@ msgstr ""
 "\n"
 "  UnitИ 3 : "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -266,7 +267,7 @@ msgstr ""
 "\n"
 "  UnitИ 4 : "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -274,7 +275,7 @@ msgstr ""
 "\n"
 "CatИgories : "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -292,7 +293,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -300,7 +301,7 @@ msgstr ""
 "\n"
 "ChaНne unique : "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -322,8 +323,8 @@ msgstr "Entrer le mot de passe pour %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -338,20 +339,20 @@ msgstr "Le curseur ne peut Йtre chargИ\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non chargИ\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Ne peut lire le bloc d'application Adresse du Pilot"
 
@@ -405,203 +406,211 @@ msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contacts"
 
-#: 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-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Erreur de chargement des information du filtre :\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Type d'identification inconnu"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Un"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Sous-arborescence"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Type de domaine inconnu"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "иditer le carnet d'adresses"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Compte"
 
-#. 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.glade.h:3
+msgid "Add Addressbook"
+msgstr "Ajouter un carnet d'adresses"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "HТte :"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Sources du carnet d'adresses"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Advanced"
+msgstr "AvancИe"
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Racine DN :"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Port :"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "Supprimer"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "Un"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 msgstr "Domaine de recherche :"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Identification :"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Domaine de recherche :"
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "Type de serveur : "
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
-msgstr "Chemin :"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Di"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 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.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"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"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Sources du carnet d'adresses"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "Gestionnaire de comptes"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_иdition"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Le serveur nИcessite une identification"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Port :"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Type de serveur : "
+
+#: addressbook/gui/component/addressbook-storage.c:138
 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/gui/component/addressbook.c:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Veuillez saisir votre %s phrase de passe pour %s"
+
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Identification"
+
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "Adresse Иlectronique :"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:418
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -609,48 +618,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Le nom contient"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "L'e-mail contient"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "Le nom contient"
+msgid "Category is"
+msgstr "CatИgories"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "AvancИe..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "CatИgorie :"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que le navigateur de dossier affichera"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Pas de nom)"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "E-mail 3"
 
@@ -674,20 +708,20 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "иditer le carnet d'adresses"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Autres contacts"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Adresse Иlectronique :"
@@ -711,13 +745,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Enlever"
 
@@ -731,38 +762,56 @@ msgstr "Enlever"
 msgid "Send HTML Mail?"
 msgstr "Envoie du message"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Autres contacts"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Destinataires du message"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "contient"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "SИlectionnez des noms"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "_Contacts"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "SИlectionnez un nom depuis :"
+msgid "F_ind"
+msgstr "Rechercher"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "SИlectionnez des noms"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "_Category:"
 msgstr "CatИgorie :"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
-msgid "_Search"
-msgstr "Rechercher"
+msgid "_Folder:"
+msgstr "_Dossier"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Destinataires du message"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -777,8 +826,8 @@ msgid "Business _Fax"
 msgstr "_Fax travail"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tИgories..."
 
@@ -787,16 +836,16 @@ msgid "Contact Editor"
 msgstr "иditeur de contacts"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "DИtails"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Classer comme :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "GИnИral"
 
@@ -821,243 +870,1245 @@ msgstr "Types de tИlИphones"
 msgid "Wants to receive _HTML mail"
 msgstr "Veut recevoir des messages _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Page Web :"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Adresse..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "Nom de l'_assistant :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_Date de naissance :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Travail"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contacts..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_DИpartement :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Nom complet..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Maison"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_Profession :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "No_m du directeur :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Mobile"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "Sur_nom :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Bureau :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Profession :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_Conjoint(e) :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_C'est l'adresse de la liste de diffusion"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Page Web :"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Supprimer le contact ?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "иlement(s) appartenant Ю ces catИgories : "
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Assistant"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Travail"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Travail 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Fax travail"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "RИpondeur"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Voiture"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "SociИtИ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Maison"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Maison 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax maison"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "RNIS"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Mobile"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Autre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Fax autre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Impossible de supprimer le fichier de rИsumИ de dossier ╚ %s ╩ : %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 #, fuzzy
 msgid "Edit Full"
 msgstr "иditer les Filtres"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet :"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 #, fuzzy
 msgid "E-mail"
 msgstr "Adresse Иlec."
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2 :"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Assistant"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Automatique"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Orientation"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "Aout"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "annИes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Taille"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "ExpИdition de ╚ %s ╩"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Courrier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Voiture"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Verifier l'adresse"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Changer"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Changer"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Couleurs"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Duplication"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "Pa_ys :"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finlande"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "AnnulИ"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+#, fuzzy
+msgid "Germany"
+msgstr "mai"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "semaine"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finlande"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "GИnИral"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Courrier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "Heures"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Dimanche"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+#, fuzzy
+msgid "Italy"
+msgstr "JournaliХre"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Basse"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Basse"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "Avril"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#, fuzzy
+msgid "Lithuania"
+msgstr "huitiХme"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Mars"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Courrier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Courrier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Courrier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Marges"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Mai"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Lundi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Mobile"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Gestionnaire"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Nouveau courrier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "SИlectionnez _tout"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Nouveau contact"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nouveau courrier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Haute"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "Avril"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minute"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Maintenant"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Coller"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finlande"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Portrait"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "aprИs"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Sections :"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Score"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "GИnИral"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "SИlectionnez un Dossier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Envoyer"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Dim"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Surnom"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finlande"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Vu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Radio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "TБches"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finlande"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "ю"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Aujourd'hui"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Mar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "TБche"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Messages multiple"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "SИlectionnez des noms"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Vu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Ville :"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "BoНte _postale :"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "иtat/_Province :"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_Code postal :"
 
@@ -1150,6 +2201,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Enlever"
@@ -1160,7 +2212,7 @@ msgid "contact-list-editor"
 msgstr "иditeur de contacts"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "иditeur de contacts"
@@ -1170,7 +2222,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1192,26 +2244,32 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
+msgid "Change Anyway"
+msgstr "Changer"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
 msgid "Changed Contact:"
 msgstr "Autres contacts"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:243
 #, fuzzy
-msgid "_Change Anyway"
-msgstr "Changer"
+msgid "Advanced Search"
+msgstr "AvancИe"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1323,44 +2381,53 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Enregistrer comme 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:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Ouvrir"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Faire suivre"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
-msgid "Send message to contact"
+msgid "Send Message to Contact"
 msgstr "Envoie un _message au 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimer"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimer une en_veloppe..."
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1377,7 +2444,8 @@ 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
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -1386,7 +2454,7 @@ msgstr "Erreur inconnue"
 msgid "Repository offline"
 msgstr "Travail en cours"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Permission refusИe"
 
@@ -1405,8 +2473,11 @@ msgid "Protocol not supported"
 msgstr "OpИration non supportИe"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "AnnulИ"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1435,148 +2506,148 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr "Erreur de lecture du fichier de courrier : %s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Cliquez ici pour ajouter un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 #, fuzzy
 msgid "File As"
 msgstr "Classer comme :"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "Adresse Иlec."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistant"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 #, fuzzy
 msgid "Business Phone"
 msgstr "Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 #, fuzzy
 msgid "Callback Phone"
 msgstr "RИpondeur"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "SociИtИ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 #, fuzzy
 msgid "Home Phone"
 msgstr "Maison 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 #, fuzzy
 msgid "Business Address"
 msgstr "Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 #, fuzzy
 msgid "Home Address"
 msgstr "Verifier l'adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "Mobile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Maison 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Other Phone"
 msgstr "Autres contacts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Other Address"
 msgstr "Verifier l'adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Site Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "DИpartement"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Bureau"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Titre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Gestionnaire"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Surnom"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Fait"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "Chargement du calendrier"
@@ -1774,6 +2845,23 @@ msgstr "Largeur :"
 msgid "_Font..."
 msgstr "Police..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Imprimer le Calendrier"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Imprimer le Calendrier"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Imprimer une en_veloppe..."
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1936,7 +3024,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "Ne peut initialiser GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Ne peut initialiser Bonobo"
@@ -1946,151 +3034,142 @@ msgstr "Ne peut initialiser Bonobo"
 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
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A %e %B %Y"
 
-#: calendar/gui/calendar-commands.c:586
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/calendar-commands.c:604
 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:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "Public"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "Public"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "O"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Haute"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Basse"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "semaine"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "OccupИ"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Non dИmarrИe"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "En cours"
 
-#: 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "ComplИtИ"
 
-#: 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:893 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2101,27 +3180,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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 "Aucune"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2131,44 +3190,51 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 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:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "IndИfini"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr ""
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Aucune"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 #, fuzzy
 msgid "Recurring"
 msgstr "RИcurrence"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigner un score"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 #, fuzzy
 msgid "No"
 msgstr "Maintenant"
@@ -2193,30 +3259,89 @@ msgstr "Semaine"
 msgid "Month View"
 msgstr "Mois"
 
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Summary contains"
+msgstr "L'e-mail contient"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "Description :"
+
+#: calendar/gui/cal-search-bar.c:58
+#, fuzzy
+msgid "Comment contains"
+msgstr "Le nom contient"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Calendrier"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "TБches"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Filtre sur la liste de diffusion"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "CrИe un nouveau rendez-vous"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Nouveau rendez-vous"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "CrИe une nouvelle tache"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "TБche"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "L'URI que le calendrier affichera"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarmes auditives"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Destinataires du message"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Options d'affichage"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2268,122 +3393,128 @@ msgstr "heures"
 msgid "minutes"
 msgstr "minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d jours"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr " 1 jour"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d semaines"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr " 1 semaine"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d heures"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 heure"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minute"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d secondes"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " 1 seconde"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Lancer un programme"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "CrИe un nouveau rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "CrИe un nouveau rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "Me rappeler de tous les rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "RИsu_mИ :"
@@ -2393,12 +3524,11 @@ msgstr "RИsu_mИ :"
 msgid "_Options..."
 msgstr "_Options"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "aprИs"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "avant"
 
@@ -2416,7 +3546,7 @@ msgstr "Me rappeler de tous les rendez-vous"
 msgid "hour(s)"
 msgstr "heure(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -2434,205 +3564,227 @@ msgid "10 minutes"
 msgstr "10 minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 heures (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 heures"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minutes"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "RИglages..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Biper quand les fenЙtres d'alarme apparaissent."
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "иlИment 'ю faire' qui finit aujourd'hui :"
 
 #: 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"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "CrИe un nouveau rendez-vous"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "PrИfИrences du calendrier"
+msgid "Days"
+msgstr "Jours"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Premier jour de la semaine :"
 
 #: 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/recurrence-page.c:969
+msgid "Friday"
+msgstr "Vendredi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
-msgid "Colors for Tasks"
-msgstr "Couleurs pour l'affichage"
+msgid "Hours"
+msgstr "Heures"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#, fuzzy
-msgid "Compress weekends in month view"
-msgstr "Compresser les week-ends"
+msgid "Minutes"
+msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "Options du navigateur de date"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Lundi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "DИfauts"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "иlИments en retard"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "Affichage"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "Samedi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Fin de la journИe :"
+#, 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:19
-msgid "First day of week:"
-msgstr "Premier jour de la semaine :"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Afficher les numИros de semaine"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Ven"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "DИbut de la journИe :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Vendredi"
+#, fuzzy
+msgid "Su_n"
+msgstr "Dim"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Dimanche"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "Lun"
+#, fuzzy
+msgid "T_hu"
+msgstr "Jeu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Lundi"
+#, fuzzy
+msgid "T_ue"
+msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "иlИments s'achevant aujourd'hui"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "иlИments en retard"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Jeudi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Me rappeler de tous les rendez-vous"
+msgid "Time"
+msgstr "Horaire"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"Fuseau horaire : "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "Sam"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Divisions du temps :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "Samedi"
+msgid "Time format:"
+msgstr "Format de date :"
 
 #: 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/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Mardi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Afficher les numИros de semaine"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Mercredi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "DИbut de la journИe :"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "Semaine de travail"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "Dim"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 heures (AM/PM)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Dimanche"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 heures"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "TБches"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "иlИments s'achevant aujourd'hui"
+msgid "_Compress weekends in month view"
+msgstr "Compresser les week-ends"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "Jeu"
+#, fuzzy
+msgid "_Display"
+msgstr "Affichage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Jeudi"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Fin de la journИe :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Time"
-msgstr "Horaire"
+#, fuzzy
+msgid "_Fri"
+msgstr "Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Divisions du temps :"
+#, fuzzy
+msgid "_General"
+msgstr "GИnИral"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Format de date :"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Supprimer le message"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"Fuseau horaire : "
+msgid "_Mon"
+msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "Mar"
+#, fuzzy
+msgid "_Other"
+msgstr "Autre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Mardi"
+#, fuzzy
+msgid "_Sat"
+msgstr "Sam"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "Mer"
+#, fuzzy
+msgid "_Task List"
+msgstr "TБches"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Mercredi"
+#, fuzzy
+msgid "_Wed"
+msgstr "Mer"
 
 #: 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:49
-msgid "minutes before they occur."
-msgstr "minutes avant leur dИbut."
+msgid "before the start of the appointment"
+msgstr "CrИe un nouveau rendez-vous"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2697,65 +3849,60 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Date d'ИchИance"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "иditer le rendez-vous"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "TБche - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "EntrИe de journal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Aucun rИsumИ"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "иcraser le fichier ?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2763,12 +3910,12 @@ 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2814,44 +3961,35 @@ msgstr "йtes-vous sШr de vouloir supprimer la tБche ╚ %s ╩ ?"
 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
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "SИlectionner un fichier"
+msgid "Addressbook..."
+msgstr "Ajouter un carnet d'adresses"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "Sections :"
+msgid "Delegate To:"
+msgstr "SupprimИ"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-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 ""
+msgid "Enter Delegate"
+msgstr "SupprimИ"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Alarme"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "RИcurrence"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "Annuler la rИunion"
@@ -2860,176 +3998,192 @@ msgstr "Annuler la rИunion"
 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/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "OccupИ"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classification"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Confidentiel"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Date & Time"
 msgstr "Date &amp; heure"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "semaine"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vИ"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Afficher"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "RИsu_mИ :"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_Confidentiel"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "Heure de _fin :"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "Heure de _dИbut :"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "Groupe %i"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "Source"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
 msgid "Chair"
 msgstr "Voiture"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, fuzzy
 msgid "Required Participant"
 msgstr "Personnes _nИcessaires"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Essai"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "SupprimИ"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "En cours"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Personnes _nИcessaires"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Personnes _nИcessaires"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Personnes _nИcessaires"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Vu"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Supprimer..."
@@ -3073,19 +4227,18 @@ msgid "Role"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "иtat"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: 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
 #, fuzzy
 msgid "Organizer:"
@@ -3131,13 +4284,14 @@ msgstr "dans le"
 msgid "th"
 msgstr "iХme"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 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:1
+#, fuzzy
+msgid "A_dd"
+msgstr "Ajouter"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3148,26 +4302,33 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "RХgle de rИcurrence"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "RИcurrence simple"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "RИcurrence personnalisИe"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Modifier"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Aucune rИcurrence"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "RИcurrence simple"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "pour"
@@ -3209,167 +4370,163 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_lИtИ :"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "SupprimИ"
+msgid "Date Completed:"
+msgstr "Date d'achХvement :"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "Aucune"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "En cours"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL :"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "TБche"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_PrioritИ :"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_lИtИ :"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_иtat :"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "En cours"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Assigner un score"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Description :"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Date de _dИbut :"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Confidentiel"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 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
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 #, fuzzy
 msgid "_Open"
 msgstr "Ouvrir"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copier"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Coller"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marquer comme terminИe"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Supprimer la tБche"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marquer comme terminИe"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Supprime la tБche"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click 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"
@@ -3405,23 +4562,23 @@ msgstr "Emplacement gИographique"
 msgid "Priority"
 msgstr "PrioritИ"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Date de dИbut"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "RИsumИ"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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"
@@ -3433,158 +4590,262 @@ 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:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3306
-#, fuzzy
-msgid "New _Appointment"
-msgstr "Nouveau rendez-vous"
-
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "_Toute la journИe"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Aller Ю aujourd'hui"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Aller Ю la date"
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Supprimer ce rendez-vous"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre ce rendez-vous dИplaГable"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "_C'est l'adresse de la liste de diffusion"
+msgid "Meeting Information"
+msgstr "Pas d'information"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Annuler la rИunion"
+
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Heure de _fin de la rИunion :"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "_C'est l'adresse de la liste de diffusion"
+
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
-msgid "The message is not understandable."
-msgstr ""
-"Ce message n'a pas de sujet.\n"
-"Voulez-vous vraiment l'envoyer ?"
+msgid "Meeting Reply"
+msgstr "Annuler la rИunion"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "SИlectionner un fichier"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "_иditer le message"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Information"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "TБchePad"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "Иtait aprИs"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "_TБche (FIXME)"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "RИpondre"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "Le dossier semble irrИmИdiablement corrompu"
+msgid "Task Cancellation"
+msgstr "Annuler la rИunion"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Calendrier"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Information utilisateur"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Information utilisateur"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Imprimer le message"
+
+#: calendar/gui/e-itip-control.c:940
 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
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Date d'achХvement :"
+
+#: calendar/gui/e-itip-control.c:967
 #, 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.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% Comp_lИtИ :"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Date d'envoi"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
@@ -3627,44 +4888,27 @@ msgstr "Mettre Ю jour le calendrier"
 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 "Tous"
-
-#: calendar/gui/e-tasks.c:252
-msgid "Category:"
-msgstr "CatИgorie :"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne peut charger la tБche dans ╚ %s ╩"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, 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"
 
-#. 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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nouveau rendez-vous..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans ╚ %s ╩"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, 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"
@@ -3690,43 +4934,43 @@ msgid "Go To Date"
 msgstr "Aller Ю la date"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Juillet"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Juin"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Mars"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Novembre"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Octobre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "Aller Ю aujourd'hui"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3882,12 +5126,6 @@ msgstr "Ve"
 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 "TБches"
-
 #. Day
 #: calendar/gui/print.c:1815
 #, fuzzy
@@ -3924,9 +5162,8 @@ msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "AperГu Avant Impression"
 
@@ -3939,7 +5176,7 @@ msgstr "Imprime cet ИlИment"
 msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "L'URI que le calendrier affichera"
@@ -3976,6 +5213,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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"
@@ -4043,7 +5376,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-filter-driver.c:667
-#, fuzzy
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "иcriture du message %d du %d"
 
@@ -4082,7 +5415,7 @@ msgstr "Erreur d'enregistrement du fichier : %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
@@ -4109,12 +5442,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -4230,13 +5563,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Aucun mot de passe fournit."
 
 #: 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Ne peut crИer le tube vers GPG/PGP : %s"
@@ -4254,15 +5587,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr "Ne peut crИer de fichier temporaire : %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Aucun destinataires spИcifiИs"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4296,7 +5629,7 @@ msgid "Connection cancelled"
 msgstr "Connexion annulИe"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ne peut se connecter Ю %s (port %d) : %s"
@@ -4307,7 +5640,7 @@ msgstr "(hТte inconnu)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "OpИration annulИe"
 
@@ -4365,8 +5698,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Cela vous connectera au serveur SMTP en utilisant une identification "
-"CRAM-MD5."
+"Cela vous connectera au serveur SMTP en utilisant une identification CRAM-"
+"MD5."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -4448,42 +5781,69 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Identification"
 
+#: 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:54
+msgid "Password"
+msgstr "Mot de passe"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Source"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: 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:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL ╚ %s ╩ a besoin du composant ╚ nom d'utilisateur ╩"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL ╚ %s ╩ a besoin du composant ╚ hТte ╩"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL ╚ %s ╩ a besoin du composant ╚ chemin ╩"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "Test de \"%s\""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4497,12 +5857,12 @@ 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:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Aucun fournisseur disponible pour le protocole ╚ %s ╩"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4549,7 +5909,7 @@ msgstr "_Message Иlectronique (FIXME)"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4557,7 +5917,7 @@ msgid ""
 msgstr "Cacher le sujet \"%s\""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4603,51 +5963,51 @@ msgstr ""
 "Vous ne pouvez Иditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "RИponse innatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "иchec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 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:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, 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:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, 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:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, 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
+#: camel/providers/imap/camel-imap-folder.c:209
 #, 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:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Enregistrement des changements dans le message..."
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
@@ -4655,12 +6015,12 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: camel/providers/imap/camel-imap-folder.c:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Enregistre les messages"
@@ -4674,7 +6034,7 @@ msgstr "Ne peut trouver le corps du message dans la rИponse FETCH."
 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
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "CrИe une nouveau contact"
@@ -4684,7 +6044,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Dossiers"
 
@@ -4728,7 +6088,7 @@ msgstr ""
 "Aucun support pour le mИcanisme d'identification demandИ."
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Aucune identification requise"
@@ -4739,7 +6099,7 @@ 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:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -4754,12 +6114,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Aucun dossier ╚ %s ╩."
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4859,7 +6219,7 @@ msgstr "Impossible de concatИner le message au dossier maildir : %s : %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4873,7 +6233,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4946,20 +6306,20 @@ msgstr "Ne peut ouvrir la boНte Ю lettres : %s : %s\n"
 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-mbox-folder.c:209
 #: 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"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Impossible de concatИner le message au fichier mbox : %s : %s"
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4971,12 +6331,12 @@ msgstr ""
 "Impossible d'obtenir le message : %s du dossier %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
@@ -5025,13 +6385,13 @@ msgstr "Le dossier ╚ %s ╩ n'est pas vide. Non supprimИ."
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing folder"
 msgstr "Synchronisation du dossier"
 
 #: camel/providers/local/camel-mbox-summary.c:254
 #: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 "Impossible d'ouvrir le dossier : %s : rИsume depuis la position %ld : %s"
 
@@ -5040,28 +6400,26 @@ msgstr ""
 #, 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"
+"Erreur fatale d'analyse du courrier prИs de la position %ld dans le dossier %"
+"s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
 msgstr "Ne peut rИsumer le dossier : %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:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Synchronisation du dossier"
 
 #: 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "Ne peut ouvrir le dossier Ю rИsumer : %s : %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5168,6 +6526,17 @@ msgstr "Les dossiers locaux ne peuvent Йtre encapsulИs."
 msgid "Spool folders cannot be deleted"
 msgstr "Les dossiers locaux ne peuvent Йtre encapsulИs."
 
+#: 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-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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5261,41 +6630,41 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Incapable d'ouvrir ou de crИer un fichier .newsrc pour %s : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "RИcupИration des messages"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, 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
+#: camel/providers/pop3/camel-pop3-folder.c:235
 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:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "Aucun message avec l'uid %s"
-
-#: 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:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Impossible d'envoyer le message : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Ne pas rИcupИrer le message du serveur POP %s : %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "Aucun message avec l'uid %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "RИcupИration du message %s"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 #, fuzzy
 msgid "Message storage"
@@ -5311,7 +6680,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:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5406,7 +6775,7 @@ msgid "No such folder `%s'."
 msgstr "Aucun dossier ╚ %s ╩."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5461,7 +6830,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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5472,130 +6841,130 @@ msgstr ""
 "Pour livrer le courrier en vous connectant Ю un distributeur distant "
 "utilisant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Commande non implИmentИe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Message d'aide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Service pret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "иchec de la transaction"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Aucun mot de passe fournit."
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 #, 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:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Aucune identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 #, fuzzy
 msgid "Authentication required"
 msgstr "Aucune identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erreur du message de bienvenur : %s : sШrement pas grave"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5606,130 +6975,130 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Livraison du courrier SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 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:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 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 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Envoie du message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 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:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Identification"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, 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:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Ne peut exИcuter %s : courrier non envoyИ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise rИponse d'identification du serveur."
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5759,7 +7128,7 @@ msgid "%.1fG"
 msgstr "%.1fGo"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "piХce-jointe"
 
@@ -5792,52 +7161,52 @@ msgstr "Type MIME :"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "De :"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "RИpondre-Ю :"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "ю :"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Entrez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 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:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5868,46 +7237,46 @@ msgstr ""
 "Erreur durant le prИparation vers %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Avertissement"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, 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
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5916,7 +7285,7 @@ msgstr ""
 "Ne peut crИer le fichier de sortie : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5925,7 +7294,7 @@ msgstr ""
 "Ne peut crИer le fichier de sortie : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5934,13 +7303,13 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5950,25 +7319,25 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "EnsИrer un fichier texte..."
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Ne peut crИer la fenЙtre de composition."
 
@@ -5997,59 +7366,100 @@ msgstr "Adresse"
 msgid "calendar information"
 msgstr "Information utilisateur"
 
+#: default_user/searches.xml.h:1
+msgid "Body contains"
+msgstr "Le corps contient"
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr "Le corps ne contient pas"
+
+#: default_user/searches.xml.h:3
+msgid "Body or subject contains"
+msgstr "Le corps ou le sujet contient"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Le nom contient"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Destinataires"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Le nom contient"
+
+#: default_user/searches.xml.h:7
+msgid "Subject contains"
+msgstr "Le sujet contient"
+
+#: default_user/searches.xml.h:8
+msgid "Subject does not contain"
+msgstr "Le sujet ne contient pas"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 #, 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 #, 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %m/%d/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -6057,14 +7467,14 @@ 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:303
+#: e-util/e-time-utils.c:313
 #, 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:312
+#: e-util/e-time-utils.c:322
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
@@ -6162,7 +7572,7 @@ msgstr "une date relative Ю la date en cours"
 msgid "Compare against"
 msgstr "Comparer avec"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "maintenant"
 
@@ -6175,11 +7585,15 @@ msgstr "passИ"
 msgid "ago"
 msgstr "passИ"
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<cliquez ici pour sИlectionner une date>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "RХgles de Filtrage"
 
@@ -6198,20 +7612,20 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "SИlectionnez un Dossier"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Entrez l'URI du dossier"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sИlectionner un dossier>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6232,62 +7646,51 @@ msgstr "Nom de la rХgle : "
 msgid "Untitled"
 msgstr "SansTitre"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "ExИcuter les actions"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "si tous les critХres sont remplis"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "si un des critХres est rempli"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Ajouter un critХre"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "entrant"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "иditer les Filtres"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "иditer les dossiers virtuels"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Entrant"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Sortant"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Dossiers Virtuels"
 
@@ -6313,200 +7716,201 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Enregistre le dossier local"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Assigner une couleur"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Assigner un score"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "PiХce-jointe"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contient"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Date de rИception"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Date d'envoi"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "SupprimИ"
 
-#: 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
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "n'existe pas"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Draft"
 msgstr "Date"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "fini avec"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "Quitter"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Expression"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Important"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "est"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "est plus que"
-
-#: 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
+#: filter/libfilter-i18n.h:15
 #, fuzzy
 msgid "Mailing list"
 msgstr "liste de diffusion %s"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Corps du message"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "En-tЙte du message"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "Le message a ИtИ reГu"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "Le message a ИtИ envoyИ"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "DИplacer vers le dossier"
 
-#: 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
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Lu"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "RИpondu Ю"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "ExpИditeur"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "DИfinir l'Иtat"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Taille"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "ressemble Ю"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Source Account"
 msgstr "Compte"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "En-tЙte spИcifique"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "DИbute avec"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "ArrЙte le traitement"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Sujet"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "contient"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "ne contient pas"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "ne fini pas avec"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "n'existe pas"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "ne ressemble pas"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "ne commence pas par"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "fini avec"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "est plus que"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "est moins que"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "n'est pas"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "est"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "sur ou aprИs"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "sur ou avant"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "ressemble Ю"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "DИbute avec"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "Иtait aprИs"
@@ -6539,14 +7943,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importer"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Courrier"
 
@@ -6572,12 +7975,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "_RИglages"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6637,182 +8040,201 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr "Configuration de la messagerie"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Filtre sur la liste de diffusion"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "_PropriИtИs..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "PropriИtИs de la Liste 'ю Faire'"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "_Message Иlectronique (FIXME)"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "_Message Иlectronique (FIXME)"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "PropriИtИs"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "PropriИtИs"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ne peut crИer de rИpertoire temporaire : %s"
 
-#: mail/folder-browser.c:893
+#: mail/folder-browser.c:909
 #, fuzzy
-msgid "Store search as vFolder"
-msgstr "SИlectionnez un Dossier"
+msgid "Create vFolder from Search"
+msgstr "CrИer une rХgle Ю partir du message"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpИditeur"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'expИditeur"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1273
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "Resend"
-msgstr "seconde"
+msgid "_Edit as New Message..."
+msgstr "_Enregistrer le message sous..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "RИpondre Ю l'expИditeur"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "RИpondre Ю _tous"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "RИpondre Ю _tous"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Marquer comme lu"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marquer comme non lu"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Important"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marquer comme non lu"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_DИplacer vers le dossier..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_RИcupИrer"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Ajouter un carnet d'adresses"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Appliquer les filtres"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "CrИer une rХgle Ю partir du message"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Pas d'information"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6874,17 +8296,17 @@ msgid "Evolution News Editor"
 msgstr "Conduit 'ю faire' d'Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conduit 'ю faire' d'Evolution"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Signature :"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6895,42 +8317,47 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (dИfaut)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 #, fuzzy
 msgid "Disable"
 msgstr "DИsactiver."
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 #, 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:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "RИcupИrer"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 #, 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 Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Gestionnaire de comptes Evolution"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "RИglages..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6984,11 +8411,11 @@ msgstr ""
 "Vous devez configurez un transport de messagerie\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 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:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6996,7 +8423,7 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -7004,38 +8431,37 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 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:410
+#: mail/mail-callbacks.c:390
 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:653
-#, fuzzy, c-format
-msgid "On %s, %s wrote:"
-msgstr "Le %s, %s a Иcrit :\n"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Message suivi :\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "DИplacez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, 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
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -7043,7 +8469,7 @@ msgstr ""
 "Vous ne pouvez Иditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -7052,25 +8478,42 @@ msgstr ""
 "Vous ne pouvez Иditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, 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:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Le message a ИtИ reГu"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Avertissement"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Ne plus afficher ce message."
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -7079,135 +8522,147 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de message..."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "иchec de l'impression du message"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, 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
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "Conduit 'ю faire' d'Evolution"
+
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
 
 #: mail/mail-config.glade.h:1
 #, fuzzy
-msgid " Check for supported types "
-msgstr "DИtecter les types supportИs..."
-
-#: mail/mail-config.glade.h:2
-#, fuzzy
 msgid " color"
 msgstr "Couleurs"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, 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
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Compte"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Information du compte"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Gestionnaire de comptes"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Accounts"
 msgstr "Compte"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "PiХce-jointe"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Identification"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Type d'identification :"
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "Composer"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -7220,317 +8675,390 @@ 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:25
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "De_fault"
 msgstr "DИfaut"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Affichage"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 #, fuzzy
 msgid "Drafts"
 msgstr "Date"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "CrИation d'un nouveau dossier"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "E_nable"
+msgstr "DИsactivИ"
+
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Enregistrer le fichier en cours avec un nom diffИrent"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: 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:37
-msgid "Empty trash folders on exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "DИsactivИ"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Nom complet :"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 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:45
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "IdentitИ"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "Voir en ligne"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
+#: mail/mail-config.glade.h:44
+msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
-#, fuzzy
-msgid "Mark messages as Read after"
-msgstr "Marque les messages comme vus [ms] : "
-
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Nouvelles"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Optional Information"
 msgstr "Pas d'information"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Organisation :"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 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:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Prompt when sending messages with an empty subject"
+msgid "Prompt when sending messages with an _empty subject"
 msgstr "Adjoint un message sans sujet"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+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
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "maildir"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "Note"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "RИception des messages"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "RИception des messages"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "RИception des messages"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "Information utilisateur"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Secure MIME"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_SИcuritИ"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Select PGP binary"
+msgid "Select Filter Log file..."
 msgstr "SИlectionner un fichier"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:69
 #, fuzzy
-msgid "Send mail in HTML format by default."
-msgstr "Envoie le message au format HTML"
+msgid "Select PGP binary"
+msgstr "SИlectionner un fichier"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Envoie du message"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Envoie du message"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Sent"
 msgstr "Vu"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Calendrier"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Joints les messages du dossier \"%s\""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Type de serveur : "
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "Le serveur nИcessite une identification"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Fichier de signature :"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Source"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Pas d'information"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Sources"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "Dossiers Virtuels"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "Use secure connection (SSL)"
+msgid "Use secure connection (_SSL)"
 msgstr "Ce serveur nИcessite une connexion sИcurisИ (SSL)"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr "Configuration de la messagerie Evolution"
 
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+msgid "_Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr "DИtecter les types supportИs..."
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "Adresse Иlectronique :"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Nom complet :"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "Signature :"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "Mettre en Иvidence les ИlИments s'achevant aujourd'hui"
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "HТte :"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "Marque les messages comme vus [ms] : "
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "Nom :"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Organisation :"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "Encrypter avec PGP"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Chemin :"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Se souvenir de ce mot de passe"
+
 #: mail/mail-config.glade.h:112
 #, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Envoie le message au format HTML"
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Fichier de signature :"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Nom d'utilisateur :"
+
+#: mail/mail-config.glade.h:116
+#, fuzzy
 msgid "newswindow1"
 msgstr "fenЙtre2"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "secondes."
 
@@ -7579,190 +9107,201 @@ msgstr "Ne peut crИer la boНte de dialogue"
 msgid "Could not create a S/MIME decode context."
 msgstr "Ne peut crИer la boНte de dialogue"
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Enregistrer la piХce-jointe"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Enregistrer sur le disque..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Voir en ligne"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Voir en ligne (via %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Cacher"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Visualiseur externe"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 #, fuzzy
 msgid "Loading message content"
 msgstr "Contenu de message invalide"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Ouvrir dans une nouvelle fenЙtre"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Contact (FIXME)"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_TБche (FIXME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enregistrer sous..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Cacher sИlectionnИ"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d secondes"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "piХce-jointe %s"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 #, 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:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Date"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adresse Иlectronique :"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "RИpondre-Ю :"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "ю"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Cc :"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Aucun programme GPG/PGP disponible."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Nettoyer l'affichage des messages"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 #, fuzzy
 msgid "Encrypted message"
 msgstr "иditer le message"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:330
 #, fuzzy, c-format
-msgid "Opening '%s'"
+msgid "No such folder /%s"
+msgstr "Aucun dossier ╚ %s ╩."
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier ╚ %s ╩ vers le format ╚ %s ╩"
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7771,7 +9310,7 @@ msgstr ""
 "Ne peut enregistrer les meta-info du dossier; vous n'allez probablement plus "
 "pouvoir ouvrir ce dossier : %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7779,11 +9318,11 @@ msgstr ""
 "Si vous ne pouvez plus ouvrir cette boНte aux lettres, alors\n"
 "vous aurez besoin de la rИparer manuellement."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "_Configuration du dossier..."
@@ -7806,107 +9345,132 @@ msgstr ""
 "Erreur durant l'exИcution de l'opИration :\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Se souvenir de ce mot de passe"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Travail en cours"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Fi_ltrer sur l'expИditeur"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "RИception des messages"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "ExpИdition de ╚ %s ╩"
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "иcriture du message %d du %d"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Marque le message %d du %d"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "ComplИtИ."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Joints les messages du dossier \"%s\""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "DИplacez le(s) message(s) vers"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Copie du message"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "DИplacement"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Duplication"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans ╚ %s ╩"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 #, fuzzy
 msgid "Trash"
 msgstr "TБche"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Messages suivis"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Ouverture du dossier %s"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synchronise \"%s\""
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Reconfiguration du dossier"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "RИcupИration du message %s"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "RИcupИration des messages"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Enregistre les messages"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7915,7 +9479,7 @@ msgstr ""
 "Ne peut crИer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7924,12 +9488,12 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Enregistrer la piХce-jointe"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7938,90 +9502,85 @@ msgstr ""
 "Ne peut crИer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ne peut Иcrire les donnИes : %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "RИcupИration du courrier depuis %s"
 
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Rechercher"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Sans titre)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Messages multiple"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "_иditer le message"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "_иditer le message"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "Faire suivre"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "Rechercher"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "Chemin :"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling..."
 msgstr "AnnulИ."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "RИception des messages"
 
-#: mail/mail-send-recv.c:253
-#, fuzzy
-msgid "Receiving"
-msgstr "RИception des messages"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "RИglages..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "RИglages..."
 
-#: mail/mail-send-recv.c:323
-#, fuzzy
-msgid "Sending"
-msgstr "ExpИdition de ╚ %s ╩"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "AnnulИ."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 #, fuzzy
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulИ la requЙte"
@@ -8041,86 +9600,92 @@ msgstr "Message suivi - %s"
 msgid "Forwarded message"
 msgstr "Messages suivis"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Faire suivre le message"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Fwd: (pas de sujet)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "Message"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "RИpondu"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Messages multiple"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 #, fuzzy
 msgid "Lowest"
 msgstr "Basse"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 #, fuzzy
 msgid "Lower"
 msgstr "Basse"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 #, fuzzy
 msgid "Higher"
 msgstr "Haute"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 #, fuzzy
 msgid "Highest"
 msgstr "Haute"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %l:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "Enregistre les messages"
 
 #: mail/message-list.etspec.h:2
@@ -8135,40 +9700,78 @@ msgstr "RИГu"
 msgid "Size"
 msgstr "Taille"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Dossier"
-
-#: mail/subscribe-dialog.c:77
-#, fuzzy
-msgid "Store"
-msgstr "Score"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Afficher les dossiers commenГant avec :"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Scrutation des dossiers dans ╚ %s ╩"
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Scrutation des dossiers dans ╚ %s ╩"
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnement au dossier ╚ %s ╩"
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "DИsabonnement au dossier ╚ %s ╩"
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Dossier"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "Le message a ИtИ reГu"
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "RafraНchir la liste"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Dossiers"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Options d'affichage"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "GИrer les abonnements..."
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "S'abonner"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Se dИsabonner"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -8178,57 +9781,74 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 #, fuzzy
 msgid "Appointments"
 msgstr "Rendez-vous"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Afficher les rendez-vous"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M %p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Aucun rИsumИ"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Ajouter un serveur de news"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Nom :"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Installation d'Evolution"
+msgid "Summary Settings"
+msgstr "RИglages..."
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8239,7 +9859,12 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Erreur de chargement du calendrier</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Serveur de forums"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Afficher les tБches"
@@ -8248,28 +9873,33 @@ msgstr "Afficher les tБches"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Autre"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Sections :"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
-msgstr "%A %e %B %Y"
+msgid "%A, %B %e %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"
+msgid "Print Summary"
+msgstr "RИsumИ"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "иchec de l'impression du message"
 
 #: my-evolution/main.c:52
@@ -8277,6 +9907,42 @@ msgstr "иchec de l'impression du message"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Ne peut initialiser Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Polices"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "DИplacement"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Filtres de message..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Filtres de message..."
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9465,127 +11131,142 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Ajouter un serveur de news"
+msgid " _Remove"
+msgstr "Enlever"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Dossiers"
+msgid "Add n_ew feed"
+msgstr "Ajouter un serveur de news"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Tout les invitИs"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "Tout les invitИs"
+msgid "All _folders:"
+msgstr "Dossiers"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Afficher les dossiers commenГant avec :"
+msgid "All news _feeds:"
+msgstr "Ajouter un serveur de news"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Options d'affichage"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "Affichage"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "Vendredi"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "mois"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr " 1 semaine"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Afficher les tБches"
 
 #: my-evolution/my-evolution.glade.h:14
 #, fuzzy
-msgid "News Feeds"
-msgstr "Serveur de forums"
+msgid "Show _today's tasks"
+msgstr "Afficher les tБches"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "Mercredi"
+msgid "Tasks "
+msgstr "TБches"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "mois"
+msgid "Units: "
+msgstr ""
+"\n"
+"  UnitИ :  "
 
 #: 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 ""
+msgid "Weather settings"
+msgstr "VИrifier les rИglages"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr "SИlectionnez un Dossier"
+msgid "_Display folders:"
+msgstr "Afficher les dossiers commenГant avec :"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Afficher les tБches"
+msgid "_Display stations:"
+msgstr "Options d'affichage"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
-msgstr ""
+#, fuzzy
+msgid "_Displayed feeds:"
+msgstr "Affichage"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Afficher les tБches"
+msgid "_Five days"
+msgstr "Vendredi"
 
 #: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "Tasks "
-msgstr "TБches"
+msgid "_Mail"
+msgstr "_Courrier"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  UnitИ :  "
+msgid "_News Feeds"
+msgstr "Serveur de forums"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Autre"
+msgid "_One day"
+msgstr "Mercredi"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "VИrifier les rИglages"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "Avril"
+msgid "_Schedule"
+msgstr "SИlectionnez un Dossier"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "Rechercher complХte"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Autre"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "Avril"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9603,7 +11284,17 @@ msgstr "DИtails"
 msgid "Cancel Operation"
 msgstr "Annuler la rИunion"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Dossiers Virtuels"
@@ -9659,7 +11350,7 @@ msgid ""
 "`%s'."
 msgstr "Une erreur est survenue durant la lecture du fichier."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9670,7 +11361,7 @@ msgstr ""
 "DИplacez le afin de permettre l'installation\n"
 "des fichiers utilisateur d'Evolution."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9679,7 +11370,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9690,57 +11381,81 @@ msgstr ""
 "d'Evolution. DИplacez le afin de permettre\n"
 "l'installation des fichiers utilisateur d'Evolution."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Ne peut obtenir le rИpertoire : %s : %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "Ne peut copier les fichiers dans\n"
 "╚ %s ╩."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copier vers le dossier"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "DИplacer vers le dossier"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Ne peut supprimer le dossier ╚ %s ╩ :\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Supprime la tБche"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, 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
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "Ouverture du dossier %s"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Nom de la rХgle : "
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nom du fichier : "
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9754,7 +11469,7 @@ msgstr ""
 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:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - CrИez un nouveau dossier"
 
@@ -9766,11 +11481,11 @@ 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:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Nouveau..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
@@ -9800,7 +11515,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9843,7 +11558,7 @@ msgstr "Automatique"
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "SИlectionner un fichier"
 
@@ -9851,32 +11566,54 @@ msgstr "SИlectionner un fichier"
 msgid "File type:"
 msgstr "Type de fichier :"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "SИlectionnez un Dossier"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Ne peut initialiser le hachage du stockage de courrier d'Evolution."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 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:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut Йtre exИcutИ."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9886,89 +11623,106 @@ 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:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Aller au dossier..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "CrИer un nouveau groupe de raccourcis"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, 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
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Work Offline"
 msgstr "Travail en cours"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affichИ)"
 
-#. 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut activer l'entrepТt local -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 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:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "Contenu de message invalide"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "Ne peut enregistrer le stockage avec le shell"
+
+#: shell/e-shell.c:1648
+#, fuzzy
+msgid "Configuration Database not found"
+msgstr "Assistant de configuration de messagerie"
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Erreur gИnИrique"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "CrИer un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Nom du groupe :"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9977,184 +11731,170 @@ msgstr ""
 "Voulez-vous vraiment enlever le groupe\n"
 "╚ %s ╩ de la barre de raccourcis ?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Ne pas enlever"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Supprime ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Supprime ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "_Petites icones"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Affiche les raccourcis sous forme de petites icones"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "_Grandes icones"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Affiche les raccourcis sous forme de grandes icones"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Nouveau groupe..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "CrИer un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Supprimer ce groupe..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Supprime ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Supprimer ce groupe..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Supprime ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Supprime ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Ouvrir dans une nouvelle fenЙtre"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Envoie le message maintenant"
 
-#: shell/e-shortcuts-view.c:479
-#, fuzzy
-msgid "Rename"
-msgstr "Nom de la rХgle : "
-
-#: shell/e-shortcuts-view.c:479
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Supprime ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Supprime ce raccourci de la barre de raccourcis"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erreur d'enregistrement des raccourcis."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-shortcuts.c:984
-#, fuzzy
-msgid "Inbox"
-msgstr "mbox"
-
-#: shell/e-shortcuts.c:987
-#, fuzzy
-msgid "Contacts"
-msgstr "_Contacts"
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Pas de nom)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Erreur gИnИrique"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le mЙme nom existe"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier spИcifiИ n'est pas valide"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisemment d'espace pour crИer le dossier"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Le dossier spИcifiИ n'a pas ИtИ trouvИ"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas implИmentИ dans cet entrepot"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "OpИration non supportИe"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Le type spИcifiИ n'est pas supportИ dans cet entrepot"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Le dossier spИcifiИ n'a pas ИtИ trouvИ"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% Comp_lИtИ :"
 
@@ -10176,11 +11916,6 @@ msgstr "HТte :"
 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:"
@@ -10197,17 +11932,27 @@ msgstr ""
 
 #: shell/importer/import.glade.h:2
 #, fuzzy
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr "Conduit 'ю faire' d'Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
+msgstr "Conduit 'ю faire' d'Evolution"
+
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
 msgstr ""
 
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "SИlectionner un fichier"
+
 #: 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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -10227,10 +11972,10 @@ 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:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10268,7 +12013,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:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10276,25 +12021,30 @@ msgstr ""
 "Merci\n"
 "L'Иquipe d'Evolution\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Ne peut initialiser le shell Evolution."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Ne peut initialiser le shell Evolution."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne peut initialiser le composant Bonobo"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Copier"
 
@@ -10311,11 +12061,11 @@ msgstr "CrИer un nouveau contact"
 msgid "Create new contact list"
 msgstr "CrИer un nouveau contact"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Couper"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Coupe la sИlection"
 
@@ -10324,80 +12074,124 @@ msgstr "Coupe la sИlection"
 msgid "Delete selected contacts"
 msgstr "Supprimer le contact"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Nouveau contact"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Nouvelles"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Coller"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Colle le contenu du presse-papiers"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Visualise le message a imprimer"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Imprimer les contacts"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "Supprimer le contact"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "SИlectionner tout"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Supprimer le contact"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Envoie un _message au contact..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "Supprimer le contact"
+
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Envoie un _message au contact..."
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "DИplace le message vers un nouveau dossier"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "ArrЙter"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "ArrЙte le chargement"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "_Actions"
+
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Sources du carnet d'adresses"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contacts"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Contacts..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Enregistrer comme VCard"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Rechercher des contacts"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Outils"
 
@@ -10408,121 +12202,138 @@ 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
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "CrИe un nouveau rendez-vous"
+msgid "Create a New _Task"
+msgstr "CrИe une nouvelle tache"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "CrИe un nouveau rendez-vous"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "Jour"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Supprimer ce rendez-vous"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "Aller Ю"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Recule dans le temps"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Avance dans le temps"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to _Date"
 msgstr "Aller Ю la date"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Va Ю une date prИcise"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Va Ю la date actuelle"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Aller Ю aujourd'hui"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "Mois"
+
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "New Appointment"
 msgstr "Nouveau rendez-vous"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+#, fuzzy
+msgid "New Task"
+msgstr "TБche"
+
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Visualise le message a imprimer"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 #, fuzzy
-msgid "Print calendar"
-msgstr "Imprimer le Calendrier"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Imprimer ce calendrier"
+msgid "Print Pre_view"
+msgstr "AperГu Avant Impression"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "Information utilisateur"
+msgid "Print this calendar"
+msgstr "_Imprimer ce calendrier"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Affiche une journИe"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Affiche un mois"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Affiche une semaine"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Affiche une semaine de travail"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
-msgid "W_ork Week"
-msgstr "Semaine de travail"
+msgid "Week"
+msgstr "Semaine"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "Rendez-vous"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "RИglages..."
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:41
 #, fuzzy
-msgid "_Day"
-msgstr "Jour"
-
-#: ui/evolution-calendar.xml.h:33
-#, fuzzy
-msgid "_Month"
-msgstr "Mois"
+msgid "_Publish Free/Busy Information"
+msgstr "Information utilisateur"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
-msgid "_Week"
-msgstr "Semaine"
+msgid "_Task..."
+msgstr "TБche"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10533,15 +12344,16 @@ msgid "Close"
 msgstr "Fermer"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Ferme ce rendez-vous"
+#, fuzzy
+msgid "Close this item"
+msgstr "Supprimer cet ИlИment"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Supprimer ce rendez-vous"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Supprimer cet ИlИment"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Barre d'outils principale"
 
@@ -10550,119 +12362,84 @@ msgstr "Barre d'outils principale"
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Enregistrer"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Enregistrer et Quitter"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
+msgid "Save the item and close the dialog box"
 msgstr "Enregistrer le contact et fermer la boНte de dialogue"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Aide"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Imprimer une en_veloppe..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Enregistrer _sous..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Enregistrer le contact et fermer la boНte de dialogue"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Voir l'aide en ligne"
-
-#: ui/evolution-contact-editor.xml.h:13
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "Envoie un _message au contact..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Supprimer cet ИlИment"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Supprimer..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Enregistrer le contact et fermer la boНte de dialogue"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "_Inviter d'autres personnes..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "Envoie un _message au contact..."
@@ -10672,21 +12449,21 @@ msgstr "Envoie un _message au contact..."
 msgid "Cancel Mee_ting"
 msgstr "Annuler la rИunion"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Faire suivre"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Fait suivre le message"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10700,16 +12477,11 @@ msgstr "SИlectionnez un Dossier"
 msgid "Schedule _Meeting"
 msgstr "SИlectionnez un Dossier"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "SИlectionnez un Dossier"
 
-#: 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-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10726,71 +12498,67 @@ msgid "Cancel the current mail operation"
 msgstr "la date actuelle"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Composer"
-
-#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "Compose un nouveau message"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "Jours vides :"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Oublier les _mots de passe"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:10
 #, fuzzy
-msgid "Manage _Subscriptions..."
-msgstr "GИrer les abonnements..."
+msgid "New Message"
+msgstr "Message"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "DИplace le message vers un nouveau dossier"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Send / Receive"
 msgstr "RИception des messages"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Envoie les messages en attente et rИcupХre les nouveaux messages"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "иditeur de dossier _virtuel..."
@@ -10820,102 +12588,112 @@ msgstr "AperГu"
 msgid "_Send / Receive"
 msgstr "RИception des messages"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "Abonnement au dossier ╚ %s ╩"
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Couper"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Supprimer le message"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Message suivi - %s"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Marquer comme lu"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Colle le contenu du presse-papiers"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "DИplace le message vers un nouveau dossier"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "SИlectionnez _tout"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
 msgid "Select _Thread"
 msgstr "SИlectionnez _tout"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 #, fuzzy
-msgid "Show _All"
-msgstr "Afficher tout"
+msgid "Sh_ow Hidden Messages"
+msgstr "Afficher _tous les messages"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Liste des messages par enfilade"
 
@@ -10923,7 +12701,7 @@ msgstr "Liste des messages par enfilade"
 msgid "_Expunge"
 msgstr "_Nettoyer"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Dossier"
 
@@ -10931,11 +12709,11 @@ msgstr "_Dossier"
 msgid "_Invert Selection"
 msgstr "_Inverser la sИlection"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_PropriИtИs..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Liste des messages par enfilade"
@@ -11189,7 +12967,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "Imprime le message sИlectionnИ"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Visualise le message a imprimer"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11211,43 +12990,37 @@ msgstr "Imprimer le message"
 msgid "Previous Unread Message"
 msgstr "Imprimer le message"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Imprimer le message..."
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "AperГu Avant Impression"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Imprimer le message"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "RИpondre"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "RИpondre Ю tous"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "Enregistrer le message sous..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Enregistrer le message dans un dossier spИcifiИ"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
@@ -11298,76 +13071,58 @@ msgstr "Dossier virtuel sur les de_stinataires"
 msgid "VFolder on _Subject..."
 msgstr "Dossier virtuel sur le sujet"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Appliquer les filtres"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "CrИer une rХgle Ю partir du message"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Faire suivre le message"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Nettoyer l'affichage des messages"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "DИplacer vers le dossier"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "_Affichage"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "_иditer le message"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "_иditer le message"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Ferme cette fenetre"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
-#, fuzzy
-msgid "Customi_ze Toolbars..."
-msgstr "Personnaliser la barre d'outils"
-
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
-msgid "Customize"
-msgstr "Personnaliser"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
-msgid "Customize toolbars"
-msgstr "Personnaliser la barre d'outils"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vue"
 
@@ -11434,11 +13189,6 @@ msgstr "Encrypter avec PGP"
 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"
@@ -11574,7 +13324,7 @@ msgstr "RИpondre-Ю :"
 msgid "_Security"
 msgstr "_SИcuritИ"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Aide"
 
@@ -11608,15 +13358,28 @@ msgstr "Se dИsabonner"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "_TБche (FIXME)"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "TБche"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Supprime la tБche"
+msgid "Cancel this task"
+msgstr "TБche"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "RafraНchir la liste"
@@ -11626,45 +13389,32 @@ msgstr "RafraНchir la liste"
 msgid "Configure the task view's settings"
 msgstr "Configuration du conduit Adresses"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Ouvrir la tБche"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "CrИe une nouvelle tache"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Supprime la tБche"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "Supprime la tБche"
 
-#: ui/evolution-tasks.xml.h:8
-#, fuzzy
-msgid "New Task"
-msgstr "TБche"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "RИglages..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Task"
 msgstr "TБche"
@@ -11702,189 +13452,169 @@ msgstr "Supprime ce raccourci de la barre de raccourcis"
 msgid "Create a new folder"
 msgstr "CrИation d'un nouveau dossier"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Supprimer cet ИlИment"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Afficher un dossier diffИrent"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "PrЙt Ю _dИmarrer"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Importer un format de fichier externe"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "DИplace le message vers un nouveau dossier"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "Ouvrir dans une nouvelle fenЙtre"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Envoie le message maintenant"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Afficher les informations concernant Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Transmettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "_Transmettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Transmets un rapport d'anomalies en utilisant Bug Buddy."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commute l'affichage de la barre de raccourcis"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 #, 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:35
-msgid "Using the _Calendar"
-msgstr "Utilisation du _calendrier"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "Utilisation de la _messagerie"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Voir le sИlecteur de dossier"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "ю _propos d'Evolution..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Rendez-vous (FIXME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "_Copier"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Dossier"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
-msgstr "_Importer un fichier..."
-
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "_Index"
-
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:42
 #, fuzzy
-msgid "_Mail message"
-msgstr "_Message Иlectronique (FIXME)"
+msgid "_Import File..."
+msgstr "_Importer un fichier..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "DИplacer"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nouveau dossier virtuel"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Remplacer..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Afficher la barre de _raccourcis"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 #, 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
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Travail en cours"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr ""
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr "Aucun rИsumИ"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Lu"
+
+#: ui/my-evolution.xml.h:6
+#, fuzzy
+msgid "Reload the view"
+msgstr "Reconstruit la vue de messages"
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
 msgstr "RИglages..."
 
 #: views/addressbook/galview.xml.h:1
@@ -11927,6 +13657,30 @@ msgstr "Message"
 msgid "With Category"
 msgstr "CatИgorie :"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "SИlectionner un fichier"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sections :"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Fuseau horaire : "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11934,10 +13688,6 @@ msgstr "CatИgorie :"
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "OccupИ"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Hors du bureau"
@@ -12011,7 +13761,7 @@ msgstr "Tout les invitИs"
 msgid "_Current View"
 msgstr "la date actuelle"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -12021,19 +13771,20 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Maintenant"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -12123,37 +13874,34 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "иditeur de contacts"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 #, fuzzy
 msgid "Save Search"
 msgstr "Rechercher"
 
-#: widgets/misc/e-filter-bar.c:241
+#: widgets/misc/e-filter-bar.h:94
 #, fuzzy
-msgid "Advanced Search"
-msgstr "AvancИe"
+msgid "Add to Saved Searches"
+msgstr "Rechercher"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "_Vider"
 
 #: 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
 msgid "Information"
 msgstr "Information"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Avertissement"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Erreur"
@@ -12171,10 +13919,15 @@ msgstr "Message"
 msgid "Don't show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Recher_cher"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "Rechercher"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr ""
@@ -12199,6 +13952,296 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
 #, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "RИsumИ"
+
+#~ msgid "LDAP Server"
+#~ msgstr "Serveur LDAP"
+
+#~ msgid "File"
+#~ msgstr "Fichier"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Type de carnet d'adresses inconnu"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Aucun (mode anonyme)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Type d'identification inconnu"
+
+#~ msgid "Subtree"
+#~ msgstr "Sous-arborescence"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Type de domaine inconnu"
+
+#~ msgid "Root DN:"
+#~ msgstr "Racine DN :"
+
+#~ msgid "Authentication:"
+#~ msgstr "Identification :"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "CrИer le chemin si il n'existe pas."
+
+#~ 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."
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Entrer le mot de passe pour %s"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "Le nom contient"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "SИlectionnez un nom depuis :"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "AnnulИ"
+
+#~ msgid "Transparent"
+#~ msgstr "Transparent"
+
+#~ msgid "Opaque"
+#~ msgstr "Opaque"
+
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 heures (am/pm)"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Biper quand les fenЙtres d'alarme apparaissent."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "PrИfИrences du calendrier"
+
+#, fuzzy
+#~ msgid "Colors for Tasks"
+#~ msgstr "Couleurs pour l'affichage"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "Options du navigateur de date"
+
+#~ msgid "Defaults"
+#~ msgstr "DИfauts"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Me rappeler de tous les rendez-vous"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minutes avant leur dИbut."
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "SupprimИ"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Aucune"
+
+#~ msgid "Task"
+#~ msgstr "TБche"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Comp_lИtИ :"
+
+#~ msgid "Transparency"
+#~ msgstr "Transparence"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr ""
+#~ "Ce message n'a pas de sujet.\n"
+#~ "Voulez-vous vraiment l'envoyer ?"
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Le dossier semble irrИmИdiablement corrompu"
+
+#~ msgid "All"
+#~ msgstr "Tous"
+
+#~ msgid "Edit"
+#~ msgstr "иditer"
+
+#, fuzzy
+#~ msgid "Store search as vFolder"
+#~ msgstr "SИlectionnez un Dossier"
+
+#, fuzzy
+#~ msgid "Resend"
+#~ msgstr "seconde"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Gestionnaire de comptes Evolution"
+
+#, fuzzy
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "Le %s, %s a Иcrit :\n"
+
+#, fuzzy
+#~ msgid "Receiving"
+#~ msgstr "RИception des messages"
+
+#, fuzzy
+#~ msgid "Store"
+#~ msgstr "Score"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Afficher les dossiers commenГant avec :"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Installation d'Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A %e %B %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "иchec de l'impression du message"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Nouveau contact"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "_Contacts"
+
+#~ msgid "Go to present time"
+#~ msgstr "Va Ю la date actuelle"
+
+#~ msgid "Print this Calendar"
+#~ msgstr "Imprimer ce calendrier"
+
+#, fuzzy
+#~ msgid "W_ork Week"
+#~ msgstr "Semaine de travail"
+
+#, fuzzy
+#~ msgid "_Day"
+#~ msgstr "Jour"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Ferme ce rendez-vous"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "Configuration de l'impression"
+
+#, fuzzy
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Enregistrer le contact et fermer la boНte de dialogue"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "_Actions"
+
+#~ msgid "Help"
+#~ msgstr "Aide"
+
+#~ msgid "See online help"
+#~ msgstr "Voir l'aide en ligne"
+
+#~ msgid "Compose"
+#~ msgstr "Composer"
+
+#, fuzzy
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "GИrer les abonnements..."
+
+#, fuzzy
+#~ msgid "Show _All"
+#~ msgstr "Afficher tout"
+
+#, fuzzy
+#~ msgid "Print Message..."
+#~ msgstr "Imprimer le message..."
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "AperГu Avant Impression"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "_иditer le message"
+
+#, fuzzy
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Personnaliser la barre d'outils"
+
+#~ msgid "Customize"
+#~ msgstr "Personnaliser"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Personnaliser la barre d'outils"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Supprime la tБche"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Enregistrer la tache comme quelquechose d'autre"
+
+#~ msgid "Getting _Started"
+#~ msgstr "PrЙt Ю _dИmarrer"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Utilisation du gestionnaire de c_ontact"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Utilisation du _calendrier"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Utilisation de la _messagerie"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Rendez-vous (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#~ msgid "_Index"
+#~ msgstr "_Index"
+
+#, fuzzy
+#~ msgid "_Mail message"
+#~ msgstr "_Message Иlectronique (FIXME)"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_TБche (FIXME)"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "RИglages..."
+
+#, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Modifier les prИfИrences"
 
@@ -12255,9 +14298,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Alarms timeout after"
 #~ msgstr "Expiration des alarmes aprХs"
 
-#~ msgid "Colors"
-#~ msgstr "Couleurs"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "Activer la sonnerie pour"
 
@@ -12276,9 +14316,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Overdue Items:"
 #~ msgstr "иlИments en retard :"
 
-#~ msgid "TaskPad"
-#~ msgstr "TБchePad"
-
 #~ msgid "Time Until Due"
 #~ msgstr "DurИe avant ИchИance"
 
@@ -12305,10 +14342,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "иdite la tБche"
 
 #, fuzzy
-#~ msgid "Go to Today"
-#~ msgstr "Aller Ю aujourd'hui"
-
-#, fuzzy
 #~ msgid "Schedule Meeting"
 #~ msgstr "SИlectionnez un Dossier"
 
@@ -12448,10 +14481,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "RDF Summary"
-#~ msgstr "RИsumИ"
-
-#, fuzzy
 #~ msgid "Factory for the test component."
 #~ msgstr "Marque la tБche comme complИtИe"
 
@@ -12516,9 +14545,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ 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)"
 
@@ -12549,9 +14575,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "CrИe un nouveau calendrier"
 
-#~ msgid "Day"
-#~ msgstr "Jour"
-
 #, fuzzy
 #~ msgid "New _Event"
 #~ msgstr "Nouveau Ca_lendrier"
@@ -12577,9 +14600,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Actio_ns"
 #~ msgstr "Actio_ns"
 
-#~ msgid "C_lear"
-#~ msgstr "_Vider"
-
 #, fuzzy
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "_TБche (FIXME)"
@@ -12623,10 +14643,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Select everything"
 #~ msgstr "SИlectionnez un Dossier"
 
-#, fuzzy
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "_TБche (FIXME)"
-
 #~ msgid "_About..."
 #~ msgstr "ю _propos..."
 
@@ -12665,9 +14681,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ 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..."
@@ -12684,10 +14697,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ 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"
 
@@ -12731,9 +14740,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "_Reply"
 #~ msgstr "RИpondre"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "_Enregistrer le message sous..."
-
 #~ msgid "_Threaded"
 #~ msgstr "_Enfiler"
 
@@ -12746,10 +14752,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ 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"
 
@@ -12806,11 +14808,11 @@ msgstr "Ne peut initialiser Bonobo"
 
 #, fuzzy
 #~ 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 ""
-#~ "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
-#~ "en clair."
+#~ "Cette option vous connectera au serveur IMAP en utilisant un mots de "
+#~ "passe en clair."
 
 #~ msgid "No such host %s."
 #~ msgstr "Aucun hТte %s."
@@ -12833,18 +14835,18 @@ msgstr "Ne peut initialiser Bonobo"
 
 #, fuzzy
 #~ msgid ""
-#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
-#~ "also be used to retrieve mail from certain web mail providers and "
+#~ "For connecting to POP servers over an SSL connection. The POP protocol "
+#~ "can also be used to retrieve mail from certain web mail providers and "
 #~ "proprietary email systems."
 #~ msgstr ""
-#~ "Pour la connexion aux serveurs POP. Le protocole POP peut aussi Йtre utilisИ "
-#~ "pour rИcupИrer les courriers depuis certains fournisseurs de courriers Web "
-#~ "et de systХmes de courriers propriИtaires."
+#~ "Pour la connexion aux serveurs POP. Le protocole POP peut aussi Йtre "
+#~ "utilisИ pour rИcupИrer les courriers depuis certains fournisseurs de "
+#~ "courriers Web et de systХmes de courriers propriИtaires."
 
 #, fuzzy
 #~ msgid ""
-#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-#~ "connection.\n"
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an "
+#~ "SSL connection.\n"
 #~ msgstr ""
 #~ "Pour livrer le courrier en vous connectant Ю un distributeur distant "
 #~ "utilisant SMTP."
@@ -12856,8 +14858,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "This option will connect to the SMTP server without using any kind of "
 #~ "authentication. This should be fine for connecting to most SMTP servers."
 #~ msgstr ""
-#~ "Cette option vous connectera au serveur SMTP sans utiliser d'identification. "
-#~ "Cela devrait Йtre suffisant pour se connecter Ю la plupart des serveurs SMTP."
+#~ "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 criterion"
 #~ msgstr "Supprimer le critХre"
@@ -12866,9 +14869,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Unspecified"
 #~ msgstr "IndИfini"
 
-#~ msgid "Advanced"
-#~ msgstr "AvancИe"
-
 #~ msgid "Email address:"
 #~ msgstr "Adresse Иlectronique :"
 
@@ -12888,12 +14888,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Mail Account"
 #~ msgstr "Compte de messagerie"
 
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Assistant de configuration de messagerie"
-
-#~ msgid "Password:"
-#~ msgstr "Mot de passe :"
-
 #~ msgid "Plain Text"
 #~ msgstr "Texte plein"
 
@@ -12911,10 +14905,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "Enregistrer le mot de passe"
 
 #, fuzzy
-#~ msgid "Server type:"
-#~ msgstr "Type de serveur : "
-
-#, fuzzy
 #~ msgid "Transport"
 #~ msgstr "Transparent"
 
@@ -12926,8 +14916,8 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "Type the name by which you would like to refer to these servers. For "
 #~ "example: \"Work\" or \"Home\"."
 #~ msgstr ""
-#~ "Tapez le nom sous lequel vous voulez identifier ces serveurs. Par exemple : "
-#~ "╚ Travail ╩ ou ╚ Maison ╩."
+#~ "Tapez le nom sous lequel vous voulez identifier ces serveurs. Par "
+#~ "exemple : ╚ Travail ╩ ou ╚ Maison ╩."
 
 #~ msgid "minutes."
 #~ msgstr "minutes."
@@ -13075,25 +15065,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "иditez la rХgle du dossier virtuel"
 
-#~ msgid "Body or subject contains"
-#~ msgstr "Le corps ou le sujet contient"
-
-#~ msgid "Body contains"
-#~ msgstr "Le corps contient"
-
-#~ msgid "Subject contains"
-#~ msgstr "Le sujet contient"
-
-#~ msgid "Body does not contain"
-#~ msgstr "Le corps ne contient pas"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "Le sujet ne contient pas"
-
-#, fuzzy
-#~ msgid "Sender contains"
-#~ msgstr "Le nom contient"
-
 #~ msgid "Connect to server"
 #~ msgstr "Connecter au serveur"
 
@@ -13174,16 +15145,10 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Calendar Preferences..."
 #~ msgstr "PrИfИrences du calendrier..."
 
-#~ msgid "_Print this calendar"
-#~ msgstr "_Imprimer ce calendrier"
-
 #, fuzzy
 #~ msgid "Create Rule"
 #~ msgstr "CrИe \"%s\""
 
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Fi_ltrer sur l'expИditeur"
-
 #~ msgid "Filter on Rec_ipients"
 #~ msgstr "Filtrer sur les _destinataires"
 
@@ -13193,9 +15158,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Reply to _Sender"
 #~ msgstr "RИpondre Ю l'_expИditeur"
 
-#~ msgid "Show _All Messages"
-#~ msgstr "Afficher _tous les messages"
-
 #~ msgid "_Filter on Subject"
 #~ msgstr "_Filtrer sur le sujet"
 
@@ -13403,7 +15365,8 @@ msgstr "Ne peut initialiser Bonobo"
 
 #~ msgid "<b>Error loading calendar:<br>Calendar in use."
 #~ msgstr ""
-#~ "<b>Erreur de chargement du calendrier :<br>Calendrier en cours d'utilisation"
+#~ "<b>Erreur de chargement du calendrier :<br>Calendrier en cours "
+#~ "d'utilisation"
 
 #~ msgid "C_lassification:"
 #~ msgstr "C_lassification :"
@@ -13415,33 +15378,18 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Could not create a tasks file in `%s'"
 #~ msgstr "Ne peut crИer un calendrier dans ╚ %s ╩"
 
-#~ msgid "Days"
-#~ msgstr "Jours"
-
-#~ msgid "Hours"
-#~ msgstr "Heures"
-
 #~ msgid "Mail _to:"
 #~ msgstr "Cou_rrier Ю :"
 
-#~ msgid "Minutes"
-#~ msgstr "Minutes"
-
 #~ msgid "_Audio"
 #~ msgstr "_Audio"
 
-#~ msgid "_Mail"
-#~ msgstr "_Courrier"
-
 #~ msgid "_Program"
 #~ msgstr "_Programme"
 
 #~ msgid "event-editor-dialog"
 #~ msgstr "event-editor-dialog"
 
-#~ msgid "Hide selected"
-#~ msgstr "Cacher sИlectionnИ"
-
 #~ msgid "Hide deleted"
 #~ msgstr "Cacher supprimИ"
 
@@ -13478,13 +15426,13 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "_Source"
 
 #~ 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 ""
 #~ "Entrez votre nom et adresse e-mail Ю utiliser dans les messages sortant. "
-#~ "Vous pouvez aussi, optionellement, entrez le nom de votre organisation, et "
-#~ "le nom du fichier dans lequel lire votre signature."
+#~ "Vous pouvez aussi, optionellement, entrez le nom de votre organisation, "
+#~ "et le nom du fichier dans lequel lire votre signature."
 
 #~ msgid "Full name:"
 #~ msgstr "Nom complet :"
@@ -13496,28 +15444,28 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "Type de source de courrier :"
 
 #~ 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 ""
-#~ "SИlectionner le type de serveur de messagerie que vous avez, et entrez les "
-#~ "informations correspondantes.\n"
+#~ "SИlectionner le type de serveur de messagerie que vous avez, et entrez "
+#~ "les informations correspondantes.\n"
 #~ "\n"
 #~ "Si le serveur nИcessite une identification, vous pouvez cliquez sur le "
 #~ "bouton \"DИtecter les types supportИs...\" aprИs avoir entrИ les autres "
 #~ "informations."
 
 #~ 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 ""
-#~ "SИlectionnez le type de serveur de forums de discussions que vous avez, et "
-#~ "entrez les informations correspondantes.\n"
+#~ "SИlectionnez le type de serveur de forums de discussions que vous avez, "
+#~ "et entrez les informations correspondantes.\n"
 #~ "\n"
 #~ "Si le serveur nИcessite une identification, vous pouvez cliquez sur le "
 #~ "bouton \"DИtecter les types supportИs...\" aprИs avoir entrИ les autres "
@@ -13635,7 +15583,8 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "Faire suivre le message \"%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 ""
 #~ "иchec de gИnИration de la partie MIME du message lors de la gИnИration du "
 #~ "message suivi."
@@ -13653,9 +15602,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr ""
 #~ "Exception lors du retour du rИsultat vers le composant shell Иcouteur."
 
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Synchronise \"%s\""
-
 #~ msgid "Displaying message UID \"%s\""
 #~ msgstr "Affichage du message UID \"%s\""
 
@@ -13684,9 +15630,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Rebuilding message view"
 #~ msgstr "Reconstruction de la vue de messages"
 
-#~ msgid "Rebuild message view"
-#~ msgstr "Reconstruit la vue de messages"
-
 #~ msgid "N_ew Directory Server"
 #~ msgstr "N_ouveau serveur d'annuaire"
 
@@ -13697,9 +15640,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "_Mail Configuration"
 #~ msgstr "Configuration de la messagerie"
 
-#~ msgid "may"
-#~ msgstr "mai"
-
 #~ msgid "sept"
 #~ msgstr "sept"
 
@@ -13799,9 +15739,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "Heures\n"
 #~ "Jours\n"
 
-#~ msgid "Daily"
-#~ msgstr "JournaliХre"
-
 #~ msgid "Weekly"
 #~ msgstr "Hebdomadaire"
 
@@ -13880,9 +15817,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Time format"
 #~ msgstr "Format de l'heure"
 
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 heures (AM/PM)"
-
 #~ msgid "24-hour"
 #~ msgstr "24 heures"
 
@@ -13957,9 +15891,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "MH folders may not be nested."
 #~ msgstr "Les dossiers MH ne peuvent Йtre encapsulИs."
 
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr "Ne peut initialiser le hachage du stockage de courrier d'Evolution."
-
 #~ msgid "Bad storage URL (no server): %s"
 #~ msgstr "Mauvaise URL de stockage (aucun serveur) : %s"
 
diff --git a/po/ga.po b/po/ga.po
index b99a5b966b..38483c0be1 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Alastair McKinstry, <mckinstry@computer.org>, 2000.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -21,197 +22,197 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -227,13 +228,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -253,8 +254,8 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -269,20 +270,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -330,203 +331,206 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:150
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
 #, fuzzy
-msgid "File"
-msgstr "_FillteАn"
+msgid "Contacts"
+msgstr "_Coinne"
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "_Coinne"
 
-#: 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-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "_Coinne"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "_Coinne"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "_Coinne"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "_OscАil"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
 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.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "_FillteАn"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+msgid "Basic"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "ScrМos"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:411
+#: addressbook/gui/component/addressbook-config.glade.h:10
 #, fuzzy
-msgid "Port:"
-msgstr "TosaМocht"
+msgid "Search _base:"
+msgstr "Post"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Post"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "FillteАn _Nua"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Abair"
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid ""
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:20
 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:"
+"This name will be used to identify your account. It is for display purposes "
+"only."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:21
+#, fuzzy
+msgid "_Account name:"
+msgstr "_OscАil"
 
-#: 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:"
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
+msgid "_Add"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:36
+msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid "_My server requires authentication"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:25
 #, fuzzy
-msgid "De_lete"
-msgstr "ScrМos"
+msgid "_Port:"
+msgstr "TosaМocht"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Post"
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
+#: addressbook/gui/component/addressbook-storage.c:138
+msgid "Other Contacts"
 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"
+#: addressbook/gui/component/addressbook.c:386
+#, c-format
+msgid "Please enter your email address and password for access to %s"
 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"
+#: addressbook/gui/component/addressbook.c:394
+msgid "LDAP Authentication"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:118
-msgid "Other Contacts"
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/component/addressbook.c:418
+msgid "Password:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -534,48 +538,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
+msgid "Category is"
 msgstr "Abair"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr ""
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "TosaМocht"
+
+#: addressbook/gui/component/addressbook.c:912
 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
+#, fuzzy
+msgid "(none)"
+msgstr "_Nota"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr ""
 
@@ -598,19 +627,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr ""
 
@@ -631,13 +660,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "ScrМos"
 
@@ -651,40 +677,57 @@ msgstr "ScrМos"
 msgid "Send HTML Mail?"
 msgstr "Post"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "_Coinne"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
+msgid "C_ontaining:"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
-msgid "Select Names"
-msgstr "FillteАn _Nua"
+msgid "Co_ntacts:"
+msgstr "_Coinne"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "FillteАn _Nua"
+msgid "F_ind"
+msgstr "PriontАil"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
+msgid "Select Names"
+msgstr "FillteАn _Nua"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
 msgid "_Category:"
 msgstr "TosaМocht"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
-msgid "_Search"
+msgid "_Folder:"
 msgstr "_FillteАn"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "_Post sceАl"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr ""
@@ -698,8 +741,8 @@ 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -708,16 +751,16 @@ msgid "Contact Editor"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
-msgstr ""
+#, fuzzy
+msgid "File A_s:"
+msgstr "_FillteАn"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr ""
 
@@ -742,247 +785,1209 @@ msgstr ""
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Delete"
 msgstr "ScrМos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Home"
 msgstr "_Nota"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr ""
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Web page address:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "ScrМos an sceal seo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 #, fuzzy
 msgid "Company"
 msgstr "Greamaigh"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 #, fuzzy
 msgid "Primary"
 msgstr "TosaМocht"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Post an sceАl seo"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 #, 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
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 #, fuzzy
 msgid "E-mail"
 msgstr "Post"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
+msgid "Afghanistan"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
+msgid "Albania"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
+msgid "Algeria"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
+msgid "American Samoa"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+msgid "Andorra"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
+msgid "Angola"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "Antarctica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "Argentina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+msgid "Austria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+msgid "Belarus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "MИid"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
+msgid "Canada"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+msgid "Chad"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
+msgid "Check Address"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "_FillteАn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+msgid "China"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "_Nota"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Greamaigh"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
+msgid "Finland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+msgid "France"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+msgid "Greece"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+msgid "Greenland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+msgid "Grenada"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+msgid "Guam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+msgid "Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+msgid "Honduras"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+msgid "Laos"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+msgid "Lesotho"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+msgid "Liberia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+msgid "Macau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+msgid "Mauritius"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+msgid "Mayotte"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+msgid "Monaco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+msgid "Mozambique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+msgid "Myanmar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Freagrair"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "_Nota"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "_Coinne"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+msgid "Niger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+msgid "Nigeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+msgid "Niue"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Sheoladh Chuig duine"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "PriontАil"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+msgid "Panama"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+msgid "Peru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "TosaМocht"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+msgid "Qatar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+msgid "Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+msgid "Seychelles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Sheoladh Chuig duine"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+msgid "Suriname"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+msgid "Taiwan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "_Teacs"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+msgid "Thailand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Do:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+msgid "Tonga"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "_Teacs"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "_Teacs"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "LeasЗ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Post an sceАl seo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "FillteАn _Nua"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+msgid "_Address:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 #, fuzzy
 msgid "_City:"
 msgstr "TosaМocht"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr ""
 
@@ -1073,6 +2078,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "ScrМos"
@@ -1082,7 +2088,7 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 msgid "Contact List Editor"
 msgstr ""
 
@@ -1091,7 +2097,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1111,25 +2117,30 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
+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
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr ""
 
@@ -1243,44 +2254,54 @@ msgstr ""
 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: 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:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_OscАil"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Send message to contact"
+msgid "Forward Contact"
+msgstr "Sheoladh Chuig duine"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "_Post sceАl"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "PriontАil"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Post an sceАl seo"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "ScrМos"
 
@@ -1295,7 +2316,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr ""
 
@@ -1303,7 +2325,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr ""
 
@@ -1320,9 +2342,12 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
-msgstr "_FillteАn"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
+msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Other error"
@@ -1345,138 +2370,138 @@ msgid "Error removing list"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 #, fuzzy
 msgid "File As"
 msgstr "_FillteАn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 #, fuzzy
 msgid "Email"
 msgstr "Post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 #, fuzzy
 msgid "Primary Phone"
 msgstr "TosaМocht"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 #, fuzzy
 msgid "Title"
 msgstr "_FillteАn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "Note"
 msgstr "_Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "_Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr ""
 
@@ -1677,6 +2702,23 @@ msgstr ""
 msgid "_Font..."
 msgstr "PriontАil"
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "PriontАil"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "PriontАil"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Post an sceАl seo"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1831,7 +2873,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
@@ -1839,149 +2881,139 @@ msgstr ""
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
+#: calendar/gui/calendar-commands.c:435
+#, c-format
+msgid "%d"
 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"
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+msgid "%d %B %Y"
+msgstr ""
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:586
+#: calendar/gui/calendar-commands.c:604
 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/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr ""
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr ""
 
-#: 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"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 #, fuzzy
 msgid "Normal"
 msgstr "Sheoladh Chuig duine"
 
-#: 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr ""
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "с:"
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
-#: calendar/gui/e-calendar-table.c:382
-msgid "Opaque"
+#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1989,70 +3021,57 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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
-#, fuzzy
-msgid "None"
-msgstr "_Nota"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr ""
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+#, fuzzy
+msgid "None"
+msgstr "_Nota"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 #, fuzzy
 msgid "No"
 msgstr "_Nota"
@@ -2075,27 +3094,89 @@ msgstr ""
 msgid "Month View"
 msgstr "PriontАil"
 
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Summary contains"
+msgstr "Abair"
+
+#: calendar/gui/cal-search-bar.c:57
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:58
+#, fuzzy
+msgid "Comment contains"
+msgstr "Abair"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+#, fuzzy
+msgid "Calendar"
+msgstr "_FillteАn"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "Tasks"
+msgstr "_Teacs"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Abair"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "ScrМos an sceal seo"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Create a new task"
+msgstr "ScrМos an sceal seo"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "_Teacs"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2144,118 +3225,124 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "Post"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr "Post"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, fuzzy
 msgid "after end of appointment"
 msgstr "_Coinne"
 
 #: 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/dialogs/recurrence-page.glade.h:2
 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Post"
@@ -2265,12 +3352,11 @@ msgstr "Post"
 msgid "_Options..."
 msgstr "_OscАil"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr ""
 
@@ -2288,7 +3374,7 @@ msgstr "_Coinne"
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr ""
 
@@ -2306,200 +3392,211 @@ msgid "10 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
+msgid "15 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
+msgid "30 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
+msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr ""
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "Post"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
+msgid "Color for overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
+msgid "Color for tasks due today"
 msgstr ""
 
 #: 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 "_FillteАn"
+msgid "Create new appointments with a default _reminder"
+msgstr "ScrМos an sceal seo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr ""
+#, fuzzy
+msgid "Days"
+msgstr "ScrМos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
+msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
+msgid "Hours"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
+msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "Defaults"
-msgstr "ScrМos"
+msgid "O_verdue tasks:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr ""
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "_Coinne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
+msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
+msgid "Sta_rt of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr ""
+#, fuzzy
+msgid "Su_n"
+msgstr "Post"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+#, fuzzy
+msgid "Sunday"
+msgstr "Post"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
+msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
+msgid "T_ue"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
+msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 #, fuzzy
-msgid "Remind me of all appointments"
-msgstr "_Coinne"
+msgid "Time"
+msgstr "_FillteАn"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Time _zone:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
+msgid "Time di_visions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#, fuzzy
-msgid "Show appointment end times in week and month views"
-msgstr "_Coinne"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
+#: ui/evolution-calendar.xml.h:33
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
+msgid "_12 hour (AM/PM)"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-#, fuzzy
-msgid "Sunday"
-msgstr "Post"
+msgid "_24 hour"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "_Teacs"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr ""
+#, fuzzy
+msgid "_Display"
+msgstr "_Post sceАl"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
+msgid "_End of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
+msgid "_Fri"
 msgstr "_FillteАn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
+msgid "_General"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr ""
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "ScrМos an sceal seo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Time zone:"
-msgstr ""
+#, fuzzy
+msgid "_Mon"
+msgstr "PriontАil"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr ""
+#, fuzzy
+msgid "_Other"
+msgstr "_OscАil"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr ""
+#, fuzzy
+msgid "_Sat"
+msgstr "SАbhАil 'san _fillteАn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr ""
+#, fuzzy
+msgid "_Task List"
+msgstr "_Teacs"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
+msgid "_Wed"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Work Week"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr ""
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr "ScrМos an sceal seo"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2561,75 +3658,70 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "_Nota"
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "_Nota"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2675,43 +3767,37 @@ msgstr ""
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "FillteАn _Nua"
+msgid "Addressbook..."
+msgstr "SАbhАil 'san _fillteАn"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "FillteАn _Nua"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr ""
+msgid "Delegate To:"
+msgstr "ScrМos"
 
-#: 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/e-delegate-dialog.glade.h:3
+#, fuzzy
+msgid "Enter Delegate"
+msgstr "ScrМos"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 #, fuzzy
 msgid "Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 #, fuzzy
 msgid "Reminder"
 msgstr "Post"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr ""
 
@@ -2719,168 +3805,180 @@ msgstr ""
 msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+msgid "B_usy"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+msgid "Con_fidential"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+msgid "F_ree"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
 msgid "Pri_vate"
 msgstr "PriontАil"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Show Time As"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 #, 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/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 msgid "Needs Action"
 msgstr "ScrМos"
 
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, fuzzy
 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "ScrМos"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "In Process"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Post"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "ScrМos"
@@ -2921,19 +4019,18 @@ msgid "Role"
 msgstr "ScrМos"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr ""
@@ -2975,12 +4072,12 @@ msgstr ""
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
@@ -2993,25 +4090,29 @@ msgid "Exceptions"
 msgstr "_OscАil"
 
 #: 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
+msgid "_Custom recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr ""
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "_No recurrence"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Simple recurrence"
+msgstr ""
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -3053,172 +4154,166 @@ 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 "ScrМos"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "_Nota"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "ScrМos"
+msgid "Date Completed:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "_Nota"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:130
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #, fuzzy
-msgid "Task"
-msgstr "_Teacs"
+msgid "_Priority:"
+msgstr "TosaМocht"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "_Coinne"
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:21
-msgid "_Due Date:"
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-#, fuzzy
-msgid "_Priority:"
-msgstr "TosaМocht"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 #, fuzzy
 msgid "_Open"
 msgstr "_OscАil"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Gearr"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "_Copy"
 msgstr "Greamaigh"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "_Paste"
 msgstr "PriontАil"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "_Post sceАl"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "_Post sceАl"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+msgid "Click to add a task"
 msgstr ""
 
-#: 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 ""
@@ -3253,24 +4348,24 @@ msgstr ""
 msgid "Priority"
 msgstr "TosaМocht"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 #, fuzzy
 msgid "Summary"
 msgstr "Post"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
 msgid "Task sort"
 msgstr "_Teacs"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Transparency"
-msgstr ""
-
 #: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr ""
@@ -3282,151 +4377,252 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3306
-#, fuzzy
-msgid "New _Appointment"
-msgstr "_Coinne"
-
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, 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."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
-msgid "This is a meeting request."
+#: calendar/gui/e-itip-control.c:618
+msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:623
+msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:628
+msgid "Meeting Update"
 msgstr ""
 
-#: 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."
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:637
+#, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:638
+msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "FillteАn _Nua"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "_Post sceАl"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "_Teacs"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "_Teacs"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "_Teacs"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Freagrair"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:691
+msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Post an sceАl seo"
+
+#: calendar/gui/e-itip-control.c:713
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:714
+msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Post an sceАl seo"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "_Nota"
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "_Nota"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+msgid "Item sent!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3467,44 +4663,27 @@ msgstr ""
 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
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, 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/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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "_Coinne"
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3530,43 +4709,43 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "January"
-msgstr ""
+#, fuzzy
+msgid "Go To Today"
+msgstr "SАbhАil 'san _fillteАn"
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "July"
+msgid "January"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "June"
+msgid "July"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "March"
+msgid "June"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "May"
+msgid "March"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "November"
+msgid "May"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "October"
+msgid "November"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:13
-msgid "September"
+msgid "October"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "SАbhАil 'san _fillteАn"
+msgid "September"
+msgstr ""
 
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3723,13 +4902,6 @@ msgstr "с:"
 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
-#, fuzzy
-msgid "Tasks"
-msgstr "_Teacs"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3763,9 +4935,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr ""
 
@@ -3779,7 +4950,7 @@ msgstr "ScrМos an sceal seo"
 msgid "Print Setup"
 msgstr "PriontАil"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3815,6 +4986,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 ""
@@ -3873,7 +5140,7 @@ msgid "Unable to process spool folder"
 msgstr ""
 
 #: camel/camel-filter-driver.c:667
-#, fuzzy
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "_Post sceАl"
 
@@ -3912,7 +5179,7 @@ msgstr ""
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3935,12 +5202,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -4054,13 +5321,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -4078,15 +5345,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4120,7 +5387,7 @@ msgid "Connection cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4131,7 +5398,7 @@ msgstr ""
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
@@ -4248,42 +5515,68 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr ""
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+msgid "POP Source URI"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4296,12 +5589,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4346,7 +5639,7 @@ msgstr "_Post sceАl"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4354,7 +5647,7 @@ msgid ""
 msgstr "Abair"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4395,61 +5688,61 @@ msgstr "Post an sceАl seo"
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "_Post sceАl"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "_Post sceАl"
@@ -4463,7 +5756,7 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr ""
 
@@ -4472,7 +5765,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 #, fuzzy
 msgid "Folders"
 msgstr "_FillteАn"
@@ -4512,7 +5805,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
@@ -4523,7 +5816,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -4535,12 +5828,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sceАl seo"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4630,7 +5923,7 @@ msgstr ""
 #: 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-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4642,7 +5935,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
@@ -4710,20 +6003,20 @@ msgstr ""
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: 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:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: 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-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4733,12 +6026,12 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
@@ -4781,13 +6074,13 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing folder"
 msgstr "FillteАn _Nua"
 
 #: 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"
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4797,25 +6090,23 @@ 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"
+msgid "Cannot summarize folder: %s: %s"
 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:1516
-msgid "Synchronising folder"
-msgstr ""
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
+msgstr "FillteАn _Nua"
 
 #: 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 ""
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
+msgstr "Post an sceАl seo"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -4917,6 +6208,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5005,40 +6307,40 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "_Post sceАl"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: 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:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Post an sceАl seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "_Post sceАl"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 #, fuzzy
 msgid "Message storage"
@@ -5054,7 +6356,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:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr ""
 
@@ -5133,7 +6435,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sendmail"
 msgstr "Post"
@@ -5186,7 +6488,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
@@ -5194,124 +6496,124 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Help message"
 msgstr "Post an sceАl seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 #, fuzzy
 msgid "Service ready"
 msgstr "Post"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5319,126 +6621,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sceАl seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
+#: camel/providers/smtp/camel-smtp-transport.c:760
+msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
-msgid "SMTP Authentication"
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5468,7 +6770,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr ""
 
@@ -5501,14 +6803,14 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 #, fuzzy
 msgid "From:"
 msgstr "с:"
@@ -5516,7 +6818,7 @@ msgstr "с:"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Freagrair"
@@ -5524,31 +6826,31 @@ msgstr "Freagrair"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5573,96 +6875,96 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "_Post sceАl"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 #, fuzzy
 msgid "Compose a message"
 msgstr "Post an sceАl seo"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr ""
 
@@ -5688,55 +6990,97 @@ msgstr ""
 msgid "calendar information"
 msgstr ""
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "Abair"
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr ""
+
+#: default_user/searches.xml.h:3
+msgid "Body or subject contains"
+msgstr ""
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "_Post sceАl"
+
+#: default_user/searches.xml.h:5
+msgid "Recipients contain"
+msgstr ""
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Abair"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Abair"
+
+#: default_user/searches.xml.h:8
+msgid "Subject does not contain"
+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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr ""
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr ""
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr ""
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5744,13 +7088,13 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:303
+#: e-util/e-time-utils.c:313
 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
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
@@ -5841,7 +7185,7 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr ""
 
@@ -5853,11 +7197,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr ""
 
@@ -5876,21 +7224,21 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 #, fuzzy
 msgid "Select Folder"
 msgstr "FillteАn _Nua"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5909,63 +7257,52 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "_FillteАn"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "_FillteАn"
@@ -5991,197 +7328,198 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Deleted"
 msgstr "ScrМos"
 
+#: filter/libfilter-i18n.h:10
+msgid "Do Not Exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Draft"
+msgstr "ScrМos"
+
+#: filter/libfilter-i18n.h:12
+msgid "Exist"
+msgstr ""
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "does not sound like"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "does not start with"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Do Not Exist"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Draft"
-msgstr "ScrМos"
+msgid "Message was sent"
+msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "FillteАn _Nua"
 
 #: filter/libfilter-i18n.h:21
-msgid "Exist"
-msgstr ""
+#, fuzzy
+msgid "Read"
+msgstr "ScrМos"
 
 #: filter/libfilter-i18n.h:22
-msgid "exists"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Expression"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Important"
+msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr ""
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
+#, fuzzy
+msgid "Sender"
+msgstr "Post"
 
 #: filter/libfilter-i18n.h:27
-msgid "is less than"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Size (kB)"
+msgstr "MИid"
 
 #: filter/libfilter-i18n.h:29
-msgid "Mailing list"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "Message Header"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "Move to Folder"
-msgstr "FillteАn _Nua"
-
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr ""
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "Abair"
 
 #: filter/libfilter-i18n.h:36
-msgid "on or before"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-#, fuzzy
-msgid "Read"
-msgstr "ScrМos"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Recipients"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "Regex Match"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Replied to"
+msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
-msgid "Score"
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
-#, fuzzy
-msgid "Sender"
-msgstr "Post"
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "Set Status"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Size (kB)"
-msgstr "MИid"
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "Source Account"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "starts with"
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:50
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
-#: mail/message-list.etspec.h:9
-msgid "Subject"
-msgstr "Abair"
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:52
 msgid "was after"
@@ -6214,14 +7552,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "Post"
@@ -6247,12 +7584,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "Post"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6305,181 +7642,199 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Abair"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "PriontАil"
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr ""
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "_Post sceАl"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "_Post sceАl"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:893
+#: mail/folder-browser.c:909
 #, fuzzy
-msgid "Store search as vFolder"
-msgstr "FillteАn _Nua"
+msgid "Create vFolder from Search"
+msgstr "Post an sceАl seo"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1273
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "Resend"
-msgstr "Post"
+msgid "_Edit as New Message..."
+msgstr "Post an sceАl seo"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Save As..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 #, fuzzy
 msgid "_Print"
 msgstr "PriontАil"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 #, fuzzy
 msgid "_Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 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
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_FillteАn"
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Undelete"
 msgstr "ScrМos"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Post an sceАl seo"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-info.c:64
+msgid "Getting Folder Information"
+msgstr ""
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr ""
@@ -6540,56 +7895,61 @@ msgid "Evolution News Editor"
 msgstr "Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "FillteАn _Nua"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 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
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 #, fuzzy
 msgid " (default)"
 msgstr "ScrМos"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "ScrМos"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 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-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "Post"
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6635,17 +7995,17 @@ msgid ""
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6653,198 +8013,226 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 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:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr ""
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Post an sceАl seo"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "_FillteАn"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
-msgid "Connecting to server..."
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, c-format
+msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
-msgid " Check for supported types "
+#: mail/mail-config.c:1809
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " color"
 msgstr "_FillteАn"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Accounts"
 msgstr "_OscАil"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "_Nota"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6854,299 +8242,365 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "De_fault"
 msgstr "ScrМos"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Done"
 msgstr "_Nota"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 #, fuzzy
 msgid "Drafts"
 msgstr "ScrМos"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr ""
 
-#: 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:"
+#: mail/mail-config.glade.h:30
+msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
+#: mail/mail-config.glade.h:31
+msgid "Each account must have a different name."
 msgstr ""
 
-#: mail/mail-config.glade.h:39
-msgid "Enabled"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "PriontАil"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
+#: mail/mail-config.glade.h:33
+msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
-msgid "HTML Signature:"
+#: mail/mail-config.glade.h:35
+msgid "HTML signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr ""
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
+#: mail/mail-config.glade.h:44
+msgid "Make this my _default account"
 msgstr ""
 
-#: 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"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
-msgid "Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "News"
 msgstr "_Nua"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr ""
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Prompt when sending messages with an empty subject"
+#: mail/mail-config.glade.h:57
+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"
+#: mail/mail-config.glade.h:58
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "_Nota"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
-msgid "Select PGP binary"
-msgstr ""
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "FillteАn _Nua"
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
+#: mail/mail-config.glade.h:69
+msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Sending Email"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Sent"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "_Post sceАl"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Type: "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+msgid "Server requires _authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "_FillteАn"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
+#: mail/mail-config.glade.h:86
+msgid "Use secure connection (_SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:87
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+msgid "_Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+msgid "_Check for supported types"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
+msgid "_Email Address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "_FillteАn"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "FillteАn _Nua"
+
+#: mail/mail-config.glade.h:100
+msgid "_Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+msgid "_Host:"
+msgstr ""
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
 #: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+msgid "_Log filter actions to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr ""
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "FillteАn _Nua"
 
 #: mail/mail-config.glade.h:105
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
+#, fuzzy
+msgid "_Name:"
+msgstr "_Nua"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "_Organization:"
 msgstr ""
 
+#: mail/mail-config.glade.h:108
+msgid "_PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "PriontАil"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "ScrМos an sceal seo"
+
 #: mail/mail-config.glade.h:112
-msgid "newswindow1"
+msgid "_Send mail in HTML format by default."
 msgstr ""
 
 #: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "FillteАn _Nua"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "_FillteАn"
+
+#: mail/mail-config.glade.h:116
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "seconds."
 msgstr "Post"
@@ -7187,204 +8641,215 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 #, fuzzy
 msgid "Loading message content"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Coinne"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Post sceАl"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "ScrМos"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "Post"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 #, fuzzy
 msgid "Date"
 msgstr "ScrМos"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 #, fuzzy
 msgid "From"
 msgstr "с:"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "Freagrair"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 #, fuzzy
 msgid "To"
 msgstr "Do:"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Post an sceАl seo"
+
+#: mail/mail-local.c:460
 #, c-format
-msgid "Opening '%s'"
+msgid "Registering '%s'"
 msgstr ""
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, 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
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "FillteАn _Nua"
@@ -7403,211 +8868,232 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "FillteАn _Nua"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Post"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 #, fuzzy
 msgid "Copying"
 msgstr "Greamaigh"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 #, fuzzy
 msgid "Trash"
 msgstr "_Teacs"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "FillteАn _Nua"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "FillteАn _Nua"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, c-format
+msgid "Synchronizing '%s'"
+msgstr ""
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "FillteАn _Nua"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "_FillteАn"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "_Post sceАl"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "_Post sceАl"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "PriontАil"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "ScrМos"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr ""
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:323
-#, fuzzy
-msgid "Sending"
-msgstr "Post"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr ""
 
@@ -7626,86 +9112,92 @@ msgstr ""
 msgid "Forwarded message"
 msgstr "_Post sceАl"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 #, fuzzy
 msgid "VFolders"
 msgstr "_FillteАn"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 #, fuzzy
 msgid "New VFolder"
 msgstr "FillteАn _Nua"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Abair"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "_Post sceАl"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 #, fuzzy
 msgid "Seen"
 msgstr "Post"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Post an sceАl seo"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "_Post sceАl"
 
 #: mail/message-list.etspec.h:2
@@ -7721,39 +9213,73 @@ msgstr ""
 msgid "Size"
 msgstr "MИid"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "_Post sceАl"
+
+#: mail/subscribe-dialog.c:176
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:275
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:277
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "_FillteАn"
 
-#: mail/subscribe-dialog.c:77
-msgid "Store"
+#: mail/subscribe-dialog.c:1490
+msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
 msgstr ""
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
+#: mail/subscribe-dialog.glade.h:1
+msgid " _Refresh List "
 msgstr ""
 
-#: mail/subscribe-dialog.c:271
-#, c-format
-msgid "Subscribing to folder \"%s\""
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "_FillteАn"
+
+#: mail/subscribe-dialog.glade.h:3
+msgid "Display options"
 msgstr ""
 
-#: mail/subscribe-dialog.c:273
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
 msgstr ""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr ""
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+msgid "_Subscribe"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:8
+msgid "_Unsubscribe"
+msgstr ""
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -7762,53 +9288,70 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr ""
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 #, fuzzy
 msgid "Appointments"
 msgstr "_Coinne"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "_Coinne"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 msgid "%l:%M%p"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 msgid "%a %l:%M%p"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Post"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Evolution"
+msgid "Summary Settings"
+msgstr "Post"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -7818,7 +9361,12 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "FillteАn _Nua"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "_Teacs"
@@ -7827,32 +9375,71 @@ msgstr "_Teacs"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Post"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Post"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %Y"
 msgstr ""
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolution"
+msgid "Print Summary"
+msgstr "Post"
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr ""
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_FillteАn"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_FillteАn"
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9016,113 +10603,131 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid "Add new feed"
-msgstr ""
+#, fuzzy
+msgid " _Remove"
+msgstr "ScrМos"
 
 #: my-evolution/my-evolution.glade.h:2
-#, fuzzy
-msgid "All folders:"
-msgstr "_FillteАn"
+msgid "Add n_ew feed"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
+msgid "Al_l stations:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
-msgid "All stations:"
-msgstr ""
+#, fuzzy
+msgid "All _folders:"
+msgstr "_FillteАn"
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "Display folders:"
+#: my-evolution/my-evolution.glade.h:5
+msgid "All news _feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:7
-msgid "Display stations:"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "Displayed feeds:"
+msgid "Ma_x number of items shown:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "_FillteАn"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
+msgid "One mont_h"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "One w_eek"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Post an sceАl seo"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "Post an sceАl seo"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "Post"
+msgid "Tasks "
+msgstr "_Teacs"
 
 #: my-evolution/my-evolution.glade.h:16
-msgid "One month"
+msgid "Units: "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "One week"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
+msgid "Weather settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Schedule"
-msgstr ""
+#, fuzzy
+msgid "_Display folders:"
+msgstr "_FillteАn"
 
 #: my-evolution/my-evolution.glade.h:20
-#, fuzzy
-msgid "Show all tasks"
-msgstr "Post an sceАl seo"
+msgid "_Display stations:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
+msgid "_Displayed feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "Show today's tasks"
-msgstr ""
+#, fuzzy
+msgid "_Five days"
+msgstr "_FillteАn"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "_Teacs"
+msgid "_Mail"
+msgstr "Post"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
-msgstr ""
+#, fuzzy
+msgid "_News Feeds"
+msgstr "FillteАn _Nua"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
+msgid "_One day"
 msgstr "Post"
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "Weather settings"
+msgid "_Refresh time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "imperial"
+msgid "_Schedule"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "_FillteАn"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Post"
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "_imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9140,7 +10745,15 @@ msgstr ""
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-local-storage.c:178
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "_FillteАn"
@@ -9186,7 +10799,7 @@ msgid ""
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9194,7 +10807,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9203,7 +10816,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9211,53 +10824,75 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "_FillteАn"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "FillteАn _Nua"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr "ScrМos an sceal seo"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "ScrМos an sceal seo"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr ""
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "ScrМos"
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "_FillteАn"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9269,7 +10904,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -9279,12 +10914,12 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 #, fuzzy
 msgid "New..."
 msgstr "_Nua"
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr ""
 
@@ -9314,7 +10949,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9358,7 +10993,7 @@ msgstr ""
 msgid "Filename:"
 msgstr "_FillteАn"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 #, fuzzy
 msgid "Select a file"
 msgstr "FillteАn _Nua"
@@ -9367,291 +11002,312 @@ msgstr "FillteАn _Nua"
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "FillteАn _Nua"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 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:437
+#: shell/e-shell-view-menu.c:423
 #, fuzzy
 msgid "Go to folder..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "ScrМos an sceal seo"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, 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
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 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
+#: shell/e-shell-view.c:1459
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1311
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:1644
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:1646
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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
+#: shell/e-shortcuts-view.c:383
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-shortcuts.c:984
-msgid "Inbox"
-msgstr ""
-
-#: shell/e-shortcuts.c:987
-#, fuzzy
-msgid "Contacts"
-msgstr "_Coinne"
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr ""
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+msgid "The specified folder cannot be modified or removed"
+msgstr ""
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
@@ -9671,11 +11327,6 @@ msgstr ""
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#, fuzzy
-msgid "Folder name:"
-msgstr "_FillteАn"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder type:"
@@ -9690,17 +11341,26 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr ""
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+msgid "Evolution Importer Assistant"
+msgstr ""
+
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
 msgstr ""
 
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "FillteАn _Nua"
+
 #: 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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -9718,10 +11378,10 @@ 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:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9738,7 +11398,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9746,27 +11406,34 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Greamaigh"
 
@@ -9783,11 +11450,11 @@ msgstr ""
 msgid "Create new contact list"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Gearr"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr ""
 
@@ -9796,83 +11463,126 @@ msgstr ""
 msgid "Delete selected contacts"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-addressbook.xml.h:10
-#, fuzzy
-msgid "New contact"
-msgstr "_Coinne"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "_Nua"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 #, fuzzy
 msgid "Paste"
 msgstr "PriontАil"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-addressbook.xml.h:21
 #, fuzzy
 msgid "Select All"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "_Post sceАl"
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "_Post sceАl"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "FillteАn _Nua"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+#, fuzzy
+msgid "_Actions"
+msgstr "_OscАil"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "Sheoladh Chuig duine"
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 #, fuzzy
 msgid "_Print..."
 msgstr "PriontАil"
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-addressbook.xml.h:39
 #, 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_UirlisМ"
 
@@ -9882,115 +11592,129 @@ 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 _Task"
 msgstr "ScrМos an sceal seo"
 
 #: ui/evolution-calendar.xml.h:6
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
-msgid "Go forward in time"
+msgid "Go forward"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr ""
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "PriontАil"
+
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "New Appointment"
 msgstr "_Coinne"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+#, fuzzy
+msgid "New Task"
+msgstr "_Teacs"
+
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
-msgstr ""
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Print this calendar"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 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:28
+#, fuzzy
+msgid "Show one day"
+msgstr "Post"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "_Coinne"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
+#: ui/evolution-calendar.xml.h:41
+msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
-msgid "_Month"
-msgstr "PriontАil"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr ""
+msgid "_Task..."
+msgstr "_Teacs"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10002,16 +11726,16 @@ msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
-msgid "Close this appointment"
+msgid "Close this item"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-comp-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 #, fuzzy
-msgid "Delete this appointment"
+msgid "Delete this item"
 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
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr ""
 
@@ -10020,124 +11744,89 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Post an sceАl seo"
 
-#: 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 "PriontАil"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 #, fuzzy
 msgid "Print this item"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:11
 #, fuzzy
 msgid "Print..."
 msgstr "PriontАil"
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-msgid "Save and Close"
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-comp-editor.xml.h:14
+msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:17
-msgid "Save this item to disk"
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save this item to disk"
 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 #, 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"
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr ""
-
 #: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Post an sceАl seo"
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:13
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "_Post sceАl"
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+#, fuzzy
+msgid "Delete..."
+msgstr "ScrМos"
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "_Post sceАl"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "_Post sceАl"
@@ -10146,20 +11835,20 @@ msgstr "_Post sceАl"
 msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10171,16 +11860,10 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-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
-#, fuzzy
-msgid "_Actions"
-msgstr "_OscАil"
-
 #: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10195,68 +11878,65 @@ msgid "Cancel the current mail operation"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr ""
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "_Post sceАl"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
@@ -10282,98 +11962,108 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr ""
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "SАbhАil 'san _fillteАn"
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Gearr"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 #, fuzzy
 msgid "Select _All"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 #, fuzzy
-msgid "Show _All"
+msgid "Sh_ow Hidden Messages"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Post an sceАl seo"
@@ -10382,7 +12072,7 @@ msgstr "Post an sceАl seo"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_FillteАn"
 
@@ -10390,12 +12080,12 @@ msgstr "_FillteАn"
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
 msgid "_Properties..."
 msgstr "PriontАil"
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Post an sceАl seo"
@@ -10634,7 +12324,7 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:58
 #, fuzzy
-msgid "Previews the message to be printed"
+msgid "Preview the message to be printed"
 msgstr "Post an sceАl seo"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10656,43 +12346,37 @@ msgstr "Post an sceАl seo"
 msgid "Previous Unread Message"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Post an sceАl seo"
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "Post an sceАl seo"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Freagrair"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "Post"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -10739,73 +12423,56 @@ msgstr "Abair"
 msgid "VFolder on _Subject..."
 msgstr "Abair"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "_FillteАn"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "_Post sceАl"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Post sceАl"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "_Post sceАl"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr ""
 
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 #, fuzzy
 msgid "_View"
 msgstr "_Nua"
@@ -10872,11 +12539,6 @@ 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
 #, fuzzy
 msgid "Save As"
@@ -11020,7 +12682,7 @@ msgstr "Freagrair"
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Help"
 msgstr "_Nota"
@@ -11055,16 +12717,28 @@ msgid "Unsubscribe"
 msgstr ""
 
 #: ui/evolution-task-editor.xml.h:1
+msgid "Assign Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
 msgid "Cancel Task"
 msgstr "_Teacs"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "ScrМos an sceal seo"
+msgid "Cancel this task"
+msgstr "_Teacs"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr ""
 
@@ -11072,45 +12746,31 @@ msgstr ""
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
-#, fuzzy
-msgid "Copy selected task"
-msgstr "ScrМos an sceal seo"
-
 #: ui/evolution-tasks.xml.h:4
 #, fuzzy
-msgid "Create a new task"
+msgid "Copy selected task"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-tasks.xml.h:8
-#, fuzzy
-msgid "New Task"
-msgstr "_Teacs"
-
-#: ui/evolution-tasks.xml.h:9
-msgid "Paste task from the clipboard"
-msgstr ""
-
 #: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
+msgid "Paste task from the clipboard"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "Post"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Task"
 msgstr "_Teacs"
@@ -11147,191 +12807,166 @@ msgstr ""
 msgid "Create a new folder"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr ""
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Toggle"
 msgstr "ScrМos"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr ""
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr ""
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr ""
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:41
-#, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "_Coinne"
-
-#: ui/evolution.xml.h:43
-#, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "_Coinne"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "Greamaigh"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_FillteАn"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "_FillteАn"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:42
 #, fuzzy
-msgid "_Import file..."
+msgid "_Import File..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr ""
-
-#: ui/evolution.xml.h:54
-#, fuzzy
-msgid "_Mail message"
-msgstr "_Post sceАl"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "ScrМos"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nua"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_New Folder"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "_OscАil"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:61
-#, fuzzy
-msgid "_Task (FIXME)"
-msgstr "_Post sceАl"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr ""
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr ""
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr "Post"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "ScrМos"
+
+#: ui/my-evolution.xml.h:6
+#, fuzzy
+msgid "Reload the view"
+msgstr "_Post sceАl"
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
 msgstr "Evolution"
 
 #: views/addressbook/galview.xml.h:1
@@ -11370,6 +13005,27 @@ msgstr "_Post sceАl"
 msgid "With Category"
 msgstr ""
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "FillteАn _Nua"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "FillteАn _Nua"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr ""
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11377,10 +13033,6 @@ msgstr ""
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr ""
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
@@ -11454,7 +13106,7 @@ msgstr ""
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11464,19 +13116,20 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
-msgid "Now"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
-msgid "Today"
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -11562,35 +13215,32 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "_FillteАn"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
+#: widgets/misc/e-filter-bar.h:94
+msgid "Add to Saved Searches"
 msgstr ""
 
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "_FillteАn"
+
 #: 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 ""
@@ -11610,10 +13260,15 @@ msgstr "_Post sceАl"
 msgid "Don't show this message again."
 msgstr "Post an sceАl seo"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr ""
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "PriontАil"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr ""
@@ -11635,14 +13290,110 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
 #, fuzzy
-#~ msgid "_Company:"
-#~ msgstr "Greamaigh"
+#~ msgid "RDF Summary"
+#~ msgstr "Post"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "FillteАn _Nua"
+
+#, fuzzy
+#~ msgid "Defaults"
+#~ msgstr "ScrМos"
+
+#, fuzzy
+#~ msgid "Remind me of all appointments"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "ScrМos"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "_Nota"
 
 #, fuzzy
-#~ msgid "TaskPad"
+#~ msgid "Task"
 #~ msgstr "_Teacs"
 
 #, fuzzy
+#~ msgid "Store search as vFolder"
+#~ msgstr "FillteАn _Nua"
+
+#, fuzzy
+#~ msgid "Resend"
+#~ msgstr "Post"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "New contact"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "Close this appointment"
+#~ msgstr "ScrМos an sceal seo"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "PriontАil"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "_OscАil"
+
+#, fuzzy
+#~ msgid "Show _All"
+#~ msgstr "Post an sceАl seo"
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "Post an sceАl seo"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "_Post sceАl"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "ScrМos an sceal seo"
+
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "_Mail message"
+#~ msgstr "_Post sceАl"
+
+#, fuzzy
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Post sceАl"
+
+#, fuzzy
+#~ msgid "_Company:"
+#~ msgstr "Greamaigh"
+
+#, fuzzy
 #~ msgid "Edit the task"
 #~ msgstr "ScrМos an sceal seo"
 
@@ -11671,10 +13422,6 @@ msgstr ""
 #~ msgstr "FillteАn _Nua"
 
 #, fuzzy
-#~ msgid "RDF Summary"
-#~ msgstr "Post"
-
-#, fuzzy
 #~ msgid "Is Not"
 #~ msgstr "_Nota"
 
@@ -11691,14 +13438,6 @@ msgstr ""
 #~ msgstr "_Nua"
 
 #, fuzzy
-#~ msgid "Address _Book... (FIXME)"
-#~ msgstr "SАbhАil 'san _fillteАn"
-
-#, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "_FillteАn"
-
-#, fuzzy
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "_Post sceАl"
 
@@ -11759,10 +13498,6 @@ msgstr ""
 #~ 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"
 
@@ -11798,13 +13533,6 @@ msgstr ""
 #~ 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"
@@ -11842,10 +13570,6 @@ msgstr ""
 #~ msgstr "Sheoladh Chuig duine"
 
 #, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "ScrМos"
-
-#, fuzzy
 #~ msgid "_Undo"
 #~ msgstr "LeasЗ"
 
@@ -11853,9 +13577,5 @@ msgstr ""
 #~ msgid "_Print Message"
 #~ msgstr "_Post sceАl"
 
-#, fuzzy
-#~ msgid "Rebuild message view"
-#~ msgstr "_Post sceАl"
-
 #~ msgid "Clos_e All Items"
 #~ msgstr "_DЗn gach rud"
diff --git a/po/gl.po b/po/gl.po
index ff2e326e2c..cc9a239805 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,10 +9,11 @@
 #
 # First Version: 2000-04-07 22:14+0200
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -30,11 +31,11 @@ msgstr "FАbrica para importar ficheiros GnomeCard a Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importa ficheiros GnomeCard a Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Tarxeta: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -42,7 +43,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -50,7 +51,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -58,7 +59,7 @@ msgstr ""
 "\n"
 "  Entregado:      "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -66,7 +67,7 @@ msgstr ""
 "\n"
 "  Adicional: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -74,7 +75,7 @@ msgstr ""
 "\n"
 "  Familia:     "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -82,7 +83,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -90,7 +91,7 @@ msgstr ""
 "\n"
 "Data de nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -98,7 +99,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -106,7 +107,7 @@ msgstr ""
 "\n"
 "  Apdo. de correos: "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -114,7 +115,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -122,7 +123,7 @@ msgstr ""
 "\n"
 "  RЗa:         "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -130,7 +131,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -138,7 +139,7 @@ msgstr ""
 "\n"
 "  RexiСn:      "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -146,7 +147,7 @@ msgstr ""
 "\n"
 "  CСdigo postal: "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -154,7 +155,7 @@ msgstr ""
 "\n"
 "  PaМs:        "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -162,7 +163,7 @@ msgstr ""
 "\n"
 "Etiqueda de entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -170,7 +171,7 @@ msgstr ""
 "\n"
 "TelИfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -178,7 +179,7 @@ msgstr ""
 "\n"
 "TelИfono:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -186,7 +187,7 @@ msgstr ""
 "\n"
 "Correo electrСnico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -194,7 +195,7 @@ msgstr ""
 "\n"
 "Correo electrСnico:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -202,7 +203,7 @@ msgstr ""
 "\n"
 "Cliente de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -210,7 +211,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -218,7 +219,7 @@ msgstr ""
 "\n"
 "LocalizaciСn XeogrАfica: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -226,7 +227,7 @@ msgstr ""
 "\n"
 "Posto Laboral: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -234,7 +235,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -242,7 +243,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -250,7 +251,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -258,7 +259,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -266,7 +267,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -274,7 +275,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -282,7 +283,7 @@ msgstr ""
 "\n"
 "CategorМas: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -300,7 +301,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -308,7 +309,7 @@ msgstr ""
 "\n"
 "Cadea Exclusiva: "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -330,8 +331,8 @@ msgstr "Introduza o contrasinal %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -346,20 +347,20 @@ msgstr "Non foi posible cargar o cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 #, fuzzy
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicaciСn Enderezo de pilot"
@@ -408,203 +409,213 @@ msgstr "FАbrica para o compoЯente Libro de Enderezos de Evolution."
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contacto"
 
-#: 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-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Erro cargando a informaciСn do filtro:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Tipo de autenticaciСn descoЯecido"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "зnico"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "SubАrbore"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Tipo de Аmbito descoЯecido"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Editar o Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Asignar ND:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "AMаяAME Texto de axuda para Asignar ND aquМ"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Conta"
 
-#. 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.glade.h:3
+msgid "Add Addressbook"
+msgstr "Engadir Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "Servidor:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Engadir Fontes para o Libro de Enderezos"
 
-#: 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.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "ND RaМz:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Base"
 
-#: 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.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Porto:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "Eliminar"
 
-#: 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.glade.h:9
+msgid "One"
+msgstr "зnico"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 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.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Buscar аmbito:"
 
-#: 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.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "Seleccionar Nomes"
 
-#: 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.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Do"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "Editar o Libro de Enderezos"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "Engadir Libro de Enderezos"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"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.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: 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:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Engadir Fontes para o Libro de Enderezos"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "XestiСn e Contas"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "O servidor require autenticaciСn"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Porto:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Mensaxe de servidor:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 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:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Introduza o seu contrasinal %s para %s"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "AutenticaciСn"
+
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "Enderezo de Correo-E:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Contrasinal"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -612,48 +623,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Calquera campo contИn"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Nome contИn"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "Enderezo contИn"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "Nome contИn"
+msgid "Category is"
+msgstr "CategorМas"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avanzado..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "CategorМa:"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosarА o Navegador de Cartafoles"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Sen nome)"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "Correo ElectrСnico 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1538
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "Correo ElectrСnico 3"
 
@@ -677,19 +713,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "Editar o Libro de Enderezos"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Editar InformaciСn de Contacto"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Engadir a Contactos"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Enderezo de Correo-E:"
@@ -713,13 +749,10 @@ msgstr ""
 "Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:630
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Quitar"
 
@@ -732,37 +765,56 @@ msgstr "Quitar Todos"
 msgid "Send HTML Mail?"
 msgstr "Enviando Correo"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Destinatarios da mensaxe"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "contИn"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Seleccionar Nomes"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "_Contacto"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "Seleccionar nome desde:"
+msgid "F_ind"
+msgstr "Buscar"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "Seleccionar Nomes"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, 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/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "_Cartafol"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Destinatarios da mensaxe"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -777,8 +829,8 @@ msgid "Business _Fax"
 msgstr "_Fax do traballo"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorМas..."
 
@@ -787,16 +839,16 @@ msgid "Contact Editor"
 msgstr "Editor de contactos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Detalles"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Arquivar como:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Xeral"
 
@@ -821,240 +873,1241 @@ msgstr "Tipos de telИfono"
 msgid "Wants to receive _HTML mail"
 msgstr "Quere recibir correo en _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Enderezo da pАxina Web:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Enderezo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "Nome do _asistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Traballo"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contactos..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "Nome _completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Nome do _Xestor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_MСbil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Sobrenome:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_ProfesiСn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_CСnxuxe:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_Este И o enderezo da lista de correo"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Enderezo da pАxina Web:"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorМas:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "ReincorporaciСn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "AutomСbil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "CompaЯМa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "MСbil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Non foi posible borrar o ficheiro de resume de cartafol `%s': %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Editar Completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Nome Completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "Correo ElectrСnico"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Enderezo _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Asistente"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "AutomАtico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "OrientaciСn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "agosto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "anos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "TamaЯo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Enviando"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Correo ElectrСnico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "CanadА"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Presidir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Comprobar Enderezo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Ficheiro"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Presidir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Cores"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Copiando"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "_PaМs:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "Estados Unidos"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Cancelada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "semana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Xeral"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Correo ElectrСnico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "horas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Domingo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "A mАis baixa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "A mАis baixa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "abril"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "marzo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Correo ElectrСnico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Correo ElectrСnico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Correo ElectrСnico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Marxes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "maio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Luns"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "MСbil"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Xestor"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Nova Mensaxe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Seleccionar _FМo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Novo contacto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nova Mensaxe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Alta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "abril"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minuto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Agora"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Pegar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Vertical"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "despois"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "SecciСns:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "PuntuaciСn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Xeral"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr ""
+"Programar\n"
+"Hora"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Enviar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Dom"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Sobrenome"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Vista"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Radio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tarefas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Para"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Hoxe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Mar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Lixo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "MЗltiples Mensaxes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Seleccionar Nomes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Vista"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "CСdigo _Postal:"
 
@@ -1145,6 +2198,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Quitar"
@@ -1155,7 +2209,7 @@ msgid "contact-list-editor"
 msgstr "Editor de contactos"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Editor de contactos"
@@ -1165,7 +2219,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1187,25 +2241,31 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "Outros Contactos"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Outros Contactos"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "BЗsqueda Avanzada"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Buscar"
 
@@ -1317,42 +2377,52 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gardar como TarxetaV"
 
-#: 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-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Re-enviar Como"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "Enviar mensaxe a un 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-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "ConfiguraciСn da ImpresiСn"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1369,7 +2439,8 @@ 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
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Erro descoЯecido"
 
@@ -1378,7 +2449,7 @@ msgstr "Erro descoЯecido"
 msgid "Repository offline"
 msgstr "Traballar desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -1397,8 +2468,11 @@ msgid "Protocol not supported"
 msgstr "OperaciСn non soportada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "Cancelada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1427,135 +2501,135 @@ msgid "Error removing list"
 msgstr "Erro cargando %s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
 "Erro lendo os datos:\n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Prema aquМ para engadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Arquivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "Correo ElectrСnico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "TelИfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "TelИfono do Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "TelИfono de Negocios"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "TelИfono de ReincorporaciСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "TelИfono da CompaЯМa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "TelИfono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "OrganizaciСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Enderezo do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Enderezo Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "TelИfono MСbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "TelИfono AutomСbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "TelИfono Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Outro TelИfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Outro Enderezo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "TМtulo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "ProfesiСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Xestor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Sobrenome"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "CСnxuxe"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "URL libre-ocupada"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Feito"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "Cargando axenda..."
@@ -1752,6 +2826,23 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "Fonte..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Imprimir Axenda"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Imprimir Axenda"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "ConfiguraciСn da ImpresiСn"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1912,7 +3003,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar Bonobo"
@@ -1921,151 +3012,142 @@ msgstr "Non foi posible inicializar Bonobo"
 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:402
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d de %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-commands.c:586
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d de %b"
+
+#: calendar/gui/calendar-commands.c:604
 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."
 
-#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "PЗblico"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "PЗblico"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "O"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "semana"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Ocupado"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Non 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Completada"
 
-#: 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2076,29 +3158,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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'"
-
-#. 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 "Nada"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2108,42 +3168,49 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 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:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "A prioridade ten que ser 'Alta', 'Normal', 'Baixa' ou 'Indefinida'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: 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'."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Recurrindo"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "Asignada"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Non"
 
@@ -2167,30 +3234,87 @@ msgstr "Definir Vistas"
 msgid "Month View"
 msgstr "Mes"
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "O resume contИn"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "DescriciСn:"
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "O comentario contИn"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Axenda"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "CartafolV sobre a Lista de Correo"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Nova Cita"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Crear unha nova tarefa"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Nova Tarefa"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "O URI que amosarА a axenda"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarmas Sonoras"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Destinatarios da mensaxe"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "OpciСns de Vista"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2242,121 +3366,127 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "%d dМas"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr " un dМa"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr " unha semana"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr " unha hora"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr " un minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " un segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Executar un programa"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "DescoЯecido"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr " antes do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr " despois do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr " antes da fin desta cita"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resume:"
 
@@ -2365,12 +3495,11 @@ msgstr "Resume:"
 msgid "_Options..."
 msgstr "_OpciСns"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "despois"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "antes"
 
@@ -2387,7 +3516,7 @@ msgstr "fin da cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -2404,204 +3533,230 @@ msgid "10 minutes"
 msgstr "10 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 horas (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 horas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minutos"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "_Preferencias de Correo..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Chifrar cando aparece a fiestra de alarma."
+msgid "Color for tasks due today"
+msgstr ""
 
 #: 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"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Crear unha nova cita"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "Preferencias da Axenda"
+#, fuzzy
+msgid "Days"
+msgstr "DМa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Primeiro dМa da semana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "Venres"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+#, fuzzy
+msgid "Hours"
+msgstr "horas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
-msgid "Compress weekends in month view"
-msgstr "Comprimir fins de semana"
+msgid "Minutes"
+msgstr "minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "OpciСns do navegador de Citas"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Luns"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "OpciСns por defecto"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Retrasar Cousas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "Visualizar"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "SАbado"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Final do dМa:"
+#, 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:19
-msgid "First day of week:"
-msgstr "Primeiro dМa da semana:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Amosar nЗmeros de semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Ven"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "Inicio do dМa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Venres"
+#, fuzzy
+msgid "Su_n"
+msgstr "Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Domingo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "Lun"
+#, fuzzy
+msgid "T_hu"
+msgstr "Xov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Luns"
+#, fuzzy
+msgid "T_ue"
+msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Cousas esperadas para hoxe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "Retrasar Cousas"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Xoves"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Lembrarme todas as citas"
+#, fuzzy
+msgid "Time"
+msgstr "TМtulo"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"Zona horaria: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "SАb"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "DivisiСns da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "SАbado"
+msgid "Time format:"
+msgstr "Formato da hora:"
 
 #: 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/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Martes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Amosar nЗmeros de semana"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "MИrcores"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "Inicio do dМa:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "Semana Lab_oral"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "Dom"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 horas (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Domingo"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 horas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "Tarefas"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "Cousas esperadas para hoxe"
+msgid "_Compress weekends in month view"
+msgstr "Comprimir fins de semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "Xov"
+#, fuzzy
+msgid "_Display"
+msgstr "Visualizar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Xoves"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Final do dМa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "TМtulo"
+msgid "_Fri"
+msgstr "Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "DivisiСns da hora:"
+#, fuzzy
+msgid "_General"
+msgstr "Xeral"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Formato da hora:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Agochar Mensaxes Borradas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"Zona horaria: "
+msgid "_Mon"
+msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "Mar"
+#, fuzzy
+msgid "_Other"
+msgstr "Outro"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Martes"
+#, fuzzy
+msgid "_Sat"
+msgstr "SАb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "MИr"
+#, fuzzy
+msgid "_Task List"
+msgstr "Tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "MИrcores"
+#, fuzzy
+msgid "_Wed"
+msgstr "MИr"
 
 #: 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:49
-msgid "minutes before they occur."
-msgstr "minutos antes de que ocorran."
+msgid "before the start of the appointment"
+msgstr " antes do comezo da cita"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2666,64 +3821,59 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Cita Agardada"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Sen resume"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "©Sobrescribir ficheiro?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2731,13 +3881,13 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "©Sobrescribilo?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Gardar _Como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2783,44 +3933,35 @@ msgstr "©EstА seguro de que quere borrar a tarefa `%s'?"
 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/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Seleccionar un ficheiro"
+msgid "Addressbook..."
+msgstr "Engadir Libro de Enderezos"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "SecciСns:"
+msgid "Delegate To:"
+msgstr "Eliminada"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 #, fuzzy
-msgid "Time Zones"
-msgstr ""
-"\n"
-"Zona horaria: "
-
-#: 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 ""
+msgid "Enter Delegate"
+msgstr "Eliminada"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Recurrencia"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancelar ReuniСn"
@@ -2829,175 +3970,191 @@ msgstr "Cancelar ReuniСn"
 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/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Ocupado"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "ClasificaciСn"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Confidencial"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Data e hora"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "semana"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "PЗ_blico"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Amosar"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "_Resume:"
 
-#: 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
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "Hora de _finalizaciСn:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "Nome do grupo:"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "Orixe do papel:"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
 msgid "Chair"
 msgstr "Presidir"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "Non-Participante"
 
-#: calendar/gui/dialogs/meeting-page.c:638
-#: calendar/gui/dialogs/meeting-page.c:661
-#: calendar/gui/dialogs/meeting-page.c:1164
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Eliminada"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "En Progreso"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Participante Opcional"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Non-Participante"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Enviada"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Eliminar..."
@@ -3041,19 +4198,18 @@ msgid "Role"
 msgstr "Posto"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: 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:"
@@ -3099,13 +4255,14 @@ msgstr "no"
 msgid "th"
 msgstr "4╨"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 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:1
+#, fuzzy
+msgid "A_dd"
+msgstr "Engadir"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3116,26 +4273,33 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Regra de Recurrencia"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Recurrencia simple"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Recurrencia personalizada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Modificar"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Sen recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Recurrencia simple"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "para"
@@ -3177,167 +4341,163 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_leta:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "Eliminada"
+msgid "Date Completed:"
+msgstr "Data Completada:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "Nada"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "En Progreso"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Tarefa"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_Prioridade:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "En Progreso"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Asignada"
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "DescriciСn:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 #, 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
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Borrar esta tarefa"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 msgstr "Prema aquМ para engadir unha tarefa"
 
-#: 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"
@@ -3372,23 +4532,23 @@ msgstr "PosiciСn xeogrАfica"
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "_Resume"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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:"
@@ -3400,155 +4560,264 @@ msgstr "%02i divisiСns de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Novo Evento de dМa _completo"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Ir А Data"
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Borrar Todas as Ocurrencias"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "_Este И o enderezo da lista de correo"
+msgid "Meeting Information"
+msgstr "InformaciСn Opcional"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 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:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Cancelar ReuniСn"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Hora do _final da reuniСn:"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:633
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Esta mensaxe non estА dispoЯible actualmente."
+msgid "Meeting Update Request"
+msgstr "_Solicitude de ReuniСn (AMаяAME)"
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "_Este И o enderezo da lista de correo"
+
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Cancelar ReuniСn"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Seleccionar un ficheiro"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Editar Mensaxe"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "InformaciСn"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "Rota de Tarefas"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "foi posterior a"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "_PeticiСn de Tarefa (AMаяAME)"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Responder"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "O cartafol parece estar corrompido sen recuperaciСn posible."
+msgid "Task Cancellation"
+msgstr "Cancelar ReuniСn"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Mensaxe da Axenda"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "InformaciСn Requerida"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "InformaciСn Requerida"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL libre-ocupada"
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL libre-ocupada"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Imprimir Mensaxe"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "║Non foi posible actualizar o ficheiro da axenda!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Data Completada:"
+
+#: calendar/gui/e-itip-control.c:967
 #, 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.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Data de envМo"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
@@ -3586,44 +4855,27 @@ msgstr "data-finalizaciСn"
 msgid "date-start"
 msgstr "data-comezo"
 
-#: 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:252
-msgid "Category:"
-msgstr "CategorМa:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar as tarefas en `%s'"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O mИtodo requirido para cargar `%s' non estА soportado"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c: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:3144 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova Cita..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O mИtodo requirido para cargar `%s' non estА soportado"
@@ -3649,43 +4901,43 @@ msgid "Go To Date"
 msgstr "Ir А Data"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "xullo"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "xuЯo"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "marzo"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "maio"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "novembro"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "outubro"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "Ir a hoxe"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3841,12 +5093,6 @@ msgstr "Ve"
 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:1815
 #, fuzzy
@@ -3884,9 +5130,8 @@ msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "PrevisualizaciСn da ImpresiСn"
 
@@ -3899,7 +5144,7 @@ msgstr "Imprimir este elemento"
 msgid "Print Setup"
 msgstr "ConfiguraciСn da ImpresiСn"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
 
@@ -3945,6 +5190,103 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+#, fuzzy
+msgid "contains? expects 2 arguments"
+msgstr "Erro de sintaxe nos parАmetros ou argumentos"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 "Non estА soportado asinar por este cifrado"
@@ -4004,6 +5346,7 @@ msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
@@ -4040,7 +5383,7 @@ msgstr "Erro analizando o filtro: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Erro executando o filtro: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro executando bЗsqueda por filtro: %s: %s"
@@ -4067,12 +5410,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(coinciden-todas) require un Зnico resultado booleano"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando peticiСn sobre a cabeceira descoЯecida: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo invАlido nos contidos do corpo, agardАbase unha cadea"
 
@@ -4188,13 +5531,13 @@ msgid "No plaintext to sign."
 msgstr "Non hai texto plano para asinar."
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Non se indicou un contrasinal."
 
 #: 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Non foi posible crear unha canalizaciСn co GPG/PGP: %s"
@@ -4212,15 +5555,15 @@ msgstr "Non hai texto plano para verificar."
 msgid "Couldn't create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "Non hai texto plano para encriptar."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Non se especificaron destinatarios."
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr "Non hai texto cifrado para desencriptar."
 
@@ -4255,7 +5598,7 @@ msgid "Connection cancelled"
 msgstr "ConexiСn Cancelada"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
@@ -4266,7 +5609,7 @@ msgstr "(mАquina descoЯecida)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "OperaciСn cancelada"
 
@@ -4403,42 +5746,69 @@ msgstr "Esta opciСn conectarase С servidor usando un simple contrasinal."
 msgid "Unknown authentication state."
 msgstr "Estado de autenticaciСn descoЯecido."
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Contrasinal"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Fontes"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: 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:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, 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:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co camiЯo"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fallo na bЗsqueda do nome: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, 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:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na bЗsqueda do servidor: %s: motivo descoЯecido"
@@ -4451,12 +5821,12 @@ msgstr "Fornecedor de correo do cartafol virtual"
 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:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, 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:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4503,7 +5873,7 @@ msgstr "Fallo na mensaxe %d"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4511,7 +5881,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4564,61 +5934,61 @@ 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-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor rematou cedo de mАis."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, 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:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, 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:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, 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
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posible cargar resume para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, 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:1491
 #: 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:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Gardando as mensaxes"
@@ -4633,7 +6003,7 @@ msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Non foi posible abrir o directorio de cachИ: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
@@ -4641,7 +6011,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -4683,7 +6053,7 @@ 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:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Non hai soporte para o tipo de autenticaciСn %s"
@@ -4694,7 +6064,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
@@ -4709,12 +6079,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4806,7 +6176,7 @@ msgstr "Non se pode engadir a mensaxe ao cartafol maildir: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4820,7 +6190,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4893,20 +6263,20 @@ msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 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-mbox-folder.c:209
 #: 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"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4918,12 +6288,12 @@ msgstr ""
 "Non И posible obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "ContrucciСn da mensaxe fallida: ©mailbox corrompido?"
@@ -4971,13 +6341,14 @@ msgstr "O cartafol `%s' non estА baleiro. Non borrado."
 #. 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"
+#, fuzzy
+msgid "Summarizing folder"
 msgstr "Resumindo cartafol"
 
 #: camel/providers/local/camel-mbox-summary.c:254
 #: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 "Non foi posible abir o cartafol: %s: resumindo desde a posiciСn %ld: %s"
 
@@ -4989,24 +6360,22 @@ msgstr ""
 "Erro fatal do analizador de correo preto da posiciСn %ld no cartafol %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"
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
 msgstr "Non И posible resumir o cartafol: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Sincronizando cartafol"
 
 #: 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5110,6 +6479,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Non И posible resumir o cartafol: %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
+
 #: camel/providers/local/camel-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5199,40 +6579,40 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Recibindo o resume de POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Non foi posible comprobar se hai mensaxes novas no servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Non foi posible abrir o cartafol: o listado de mensaxes era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "Non existe a mensaxe con UID %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Recibindo a mensaxe POP %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Non foi posible recoller a mensaxe: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "Non existe a mensaxe con UID %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Recibindo a mensaxe POP %d"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Almacenamento da mensaxe"
@@ -5246,7 +6626,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:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5340,7 +6720,7 @@ msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5395,7 +6775,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a travИs do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5405,126 +6785,126 @@ msgstr ""
 "Para entregar correo por conexiСn a un servidor de correo remoto usando "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando non recoЯecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos parАmetros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "ParАmetro do comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 #, 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:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Mensaxe de Axuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Servicio pechando a canle de transmisiСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 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:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "AcciСn de correo pedida exitosa, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 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:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "A acciСn de correo pedida non foi levada a cabo: caixa de correo non "
 "dispoЯible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 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:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "AcciСn pedida abortada: erro ao procesar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 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:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "A acciСn pedida non foi levada a cabo: insuficiente almacenamento no sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 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:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 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:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 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:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Fallo na transacciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "NecesМtase un contrasinal para a transacciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticaciСn И feble de mАis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 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:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal de autenticaciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "AutenticaciСn requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, 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:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5535,127 +6915,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP vМa %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 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:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 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 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 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:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta HELO: %s: non fatal"
 
-#: 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:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "AutenticaciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr "Erro creando o obxecto de autenticaciСn SASL."
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "A peticiСn AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "A peticiСn AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticaciСn do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, 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:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A peticiСn RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, 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:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta QUIT: %s: non fatal"
@@ -5685,7 +7065,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "anexo"
 
@@ -5718,52 +7098,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Prema aquМ para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirАn unha copia da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5792,30 +7172,30 @@ msgid ""
 "%s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Advertencia"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5823,17 +7203,17 @@ 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
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, 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
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5842,7 +7222,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saМda: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5851,7 +7231,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saМda: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5860,16 +7240,16 @@ msgstr ""
 "Erro gardando mensaxes en: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 #, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "©GЗstarМalle importalos a Evolution?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5879,25 +7259,25 @@ msgstr ""
 "\n"
 "©Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "Inserir ficheiro de texto..."
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "CompoЯer unha mensaxe"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Non foi posible crear a fiestra do compositor"
@@ -5929,59 +7309,105 @@ msgstr "tarxeta de enderezo"
 msgid "calendar information"
 msgstr "informaciСn de axenda"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "contИn"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "non contИn"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "O comentario contИn"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Nome contИn"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Destinatarios"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Nome contИn"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Nome contИn"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "non contИn"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 #, 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 #, 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %d/%m/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5989,14 +7415,14 @@ 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
+#: e-util/e-time-utils.c:313
 #, 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
+#: e-util/e-time-utils.c:322
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -6095,7 +7521,7 @@ msgstr "unha hora relativa А hora actual"
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "agora"
 
@@ -6107,11 +7533,16 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<prema aquМ para seleccionar unha data>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Regras de Filtrado"
 
@@ -6132,20 +7563,20 @@ 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:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Introduza o URI do cartafol"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<prema aquМ para seleccionar un cartafol>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6166,62 +7597,51 @@ msgstr "Nome da regra: "
 msgid "Untitled"
 msgstr "Sen_tМtulo"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Executar acciСns"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "se se cumpren tСdolos criterios"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "se se cumpre algЗn criterio"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Editar Filtros"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Editar CartafolesV"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Entrante"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "SaМnte"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Cartafoles Virtuais"
 
@@ -6245,194 +7665,195 @@ msgstr "con todos os cartafoles locais e cos remotos activos"
 msgid "with all local folders"
 msgstr "con todos os cartafoles locais"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Asignar PuntuaciСn"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Anexos"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contИn"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copiar С cartafol"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Data de recepciСn"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Data de envМo"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "non contИn"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "non remata en"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "non sona como"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "non empeza por"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Non Existe"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "remata en"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "ExpresiСn"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "И"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "И maior que"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "И menor que"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "non И"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "A mensaxe foi recibida"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "A mensaxe foi enviada"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Mover С cartafol"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "en ou despois"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "en ou antes"
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Ler"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Coincide expresiСn regular (regexp)"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 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:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "TamaЯo"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "sona como"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Conta Fonte"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Cabeceira especМfica"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "comeza por"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "contИn"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "non contИn"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "non remata en"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "non existe"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "non sona como"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "non empeza por"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "remata en"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "И maior que"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "И menor que"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "non И"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "И"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "en ou despois"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "en ou antes"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "sona como"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "comeza por"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "foi posterior a"
@@ -6462,14 +7883,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "Correo ElectrСnico"
@@ -6501,12 +7921,12 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Netscape.\n"
 "©GЗstarМalle importalos a Evolution?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "Preferencias..."
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6565,170 +7985,191 @@ msgstr "FАbrica para a compoЯente Resume de Correo."
 msgid "Mail configuration interface"
 msgstr "ConfiguraciСn do Correo"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "CartafolV sobre a Lista de Correo"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "_Propiedades..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Modificar as propiedades do ficheiro"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Enviar _Mensaxe"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Enviar _Mensaxe"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoЯente de correo de Evolution."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 #, fuzzy
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o almacenamento coa shell"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para \"%s\""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "_Crear Filtro desde Mensaxe"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "CartafolV sobre o A_sunto"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "CartafolV sobre o Au_tor"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "CartafolV sobre os _Destinatarios"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV sobre _Lista de Correo"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Filtro sobre o As_unto"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Filtro sobre o Au_tor"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Filtro sobre os D_estinatarios"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Filtro sobre a Lista de _Correo"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "Re-enviar"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "_Gardar Mensaxe Como..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Responder С Autor"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _non Lida"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Importante"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marcar como _non Lida"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_Mover С cartafol.."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Copiar С cartafol..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "Crear Reg_ra Desde Mensaxe"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filtro sobre a Lista de Correo"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "CartafolV sobre a Lista de Correo"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtro sobre a Lista de Correo (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "CartafolV sobre a Lista de Correo (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "InformaciСn Opcional"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6792,16 +8233,16 @@ msgid "Evolution News Editor"
 msgstr "Editor de Contas de Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6812,40 +8253,45 @@ msgstr ""
 "\n"
 "©Desexa gardar os cambios?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Desactivado"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "©EstА seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Recuperar"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "Facer esta a miЯa conta por defecto"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "©EstА seguro de que quere borrar esta conta de novas?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Xestor de Contas de Evolution"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "_Preferencias de Correo..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6900,11 +8346,11 @@ msgstr ""
 "Necesitas configurar transporte para o correo\n"
 "antes de poder compoЯelo."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 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:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6912,7 +8358,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "©Enviar realmente?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6920,37 +8366,36 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 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:410
+#: mail/mail-callbacks.c:390
 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:653
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "O %s, %s escribiu:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Mensaxe reenviada:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, 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:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6958,7 +8403,7 @@ msgstr ""
 "SС pode editar mensaxes gardadas\n"
 "no cartafol de Borrador."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6966,25 +8411,42 @@ msgstr ""
 "SС pode reenviar mensaxes\n"
 "no cartafol de Enviados."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, 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:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "A mensaxe foi recibida"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Advertencia"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Non preguntar de novo"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6993,62 +8455,72 @@ msgstr ""
 "Erro cargando a informaciСn do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtros..."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "A impresiСn da mensaxe fallou"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, 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-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"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."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"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."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"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."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "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 "
@@ -7057,81 +8529,88 @@ msgstr ""
 "propСsito de mostralo."
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr " Detectar tipos soportados "
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, 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
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "InformaciСn de Contas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "XestiСn e Contas"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "AutenticaciСn"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Tipo de AutenticaciСn: "
 
-#: 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:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "Redactar"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7147,283 +8626,259 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuraciСn."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Visualizar"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Cartafol Borradores:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:30
 #, fuzzy
-msgid "Edit..."
-msgstr "Editar..."
+msgid "E_nable"
+msgstr "Activado"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "Enderezo de Correo-E:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Editar..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Nome Completo:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:43
-#, fuzzy
-msgid "Highlight citations with"
-msgstr "Resaltar citas con "
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "м_ndice"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "ConfiguraciСn do Correo"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, 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:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "Marcar mensaxes como \"Lidas\" despois de: "
+msgid "Make this my _default account"
+msgstr "Facer esta a miЯa conta por defecto"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Novas"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "InformaciСn Opcional"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "OrganizaciСn:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 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:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 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:57
+#, fuzzy
+msgid "Prompt when sending messages with an _empty subject"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+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
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "No_tas:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Recibindo OpciСns"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "InformaciСn Requerida"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Seleccionar un ficheiro"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Seleccionar o binario PGP"
 
-#: 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:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Enviada"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "ConfiguraciСn do Servidor"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "O servidor require autenticaciСn"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Sen InformaciСn"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "mbox estАndar de Unix"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use secure connection (_SSL)"
 msgstr "Usar conexiСn segura (SSL)"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Nome de usuario:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7431,15 +8886,119 @@ msgstr ""
 "\n"
 "Preme en \"Seguinte\" para empezar. "
 
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "Comprobar automaticamente se hai correo novo de cada"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr " Detectar tipos soportados "
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "Enderezo de Correo-E:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Nome Completo:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "Resaltar citas con "
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "Marcar mensaxes como \"Lidas\" despois de: "
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "Nome:"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "OrganizaciСn:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "CamiЯo do binario PGP"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "CamiЯo:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Lembrar este contrasinal"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Enviar mensaxes en formato HTML por defecto."
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome de usuario:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "segundos."
 
@@ -7487,187 +9046,198 @@ msgstr "Non foi posible crear a fiestra do compositor"
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear a fiestra do compositor"
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Gardar С Disco..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (vМa %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Abrir ligazСn no navegador"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Copiar localizaciСn (AMаяAME)"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gardar como (AMаяAME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gardar como..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Eliminada"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d segundos"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "Enderezo de Correo-E:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "Responder-A:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "O programa GPG/PGP non estА configurado."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Preme na icona para desencriptar."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 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:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Esta mensaxe estА asinada dixitalmente pero non se puido comprobar a sЗa "
 "autenticidade"
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, 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:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoЯecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Parte externa do corpo mal formada."
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Non existe o cartafol %s"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Abrindo '%s'"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" С formato \"%s\""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7676,7 +9246,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:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7684,12 +9254,12 @@ msgstr ""
 "Se non pode abrir mАis esta caixa de correo, poida\n"
 "que teЯa que reparala a man."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, 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
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "Configurar %s"
@@ -7712,105 +9282,130 @@ msgstr ""
 "Erro efectuando a operaciСn:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Lembrar este contrasinal"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Reconfigurando o cartafol"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Recibindo Correo"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Lixo"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo almacenamento %s"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Abrindo cartafol %s"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Sincronizando cartafol"
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Reconfigurando o cartafol"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo as mensaxes"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando as mensaxes"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7819,7 +9414,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saМda: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7828,11 +9423,11 @@ msgstr ""
 "Erro gardando mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7841,87 +9436,83 @@ msgstr ""
 "Non И posible crear ficheiro de saМda: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Buscar"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Sen_tМtulo)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "MЗltiples Mensaxes"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "Editar Mensaxe"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "Editar Mensaxe"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "Re-enviar"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "Buscar"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "CamiЯo:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Cancelando ..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Recibindo"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "Actualizando ..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "Agardando ..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "Enviando"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr ""
 
@@ -7940,85 +9531,90 @@ msgstr "Mensaxe reenviada - %s"
 msgid "Forwarded message"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Novo CArtafolV"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Fwd: (sen asunto)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "Mensaxe"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "MЗltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "MЗltiples Mensaxes"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "A mАis baixa"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "A mАis alta"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Hoxe Аs %k:%M"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Onte Аs %k:%M"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: 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:915
+#: mail/message-list.c:938
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "Gardando as mensaxes"
 
 #: mail/message-list.etspec.h:2
@@ -8034,38 +9630,77 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "TamaЯo"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Cartafol"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "Almacenar"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Mostar cartafoles que comezan por:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Conseguindo almacenamento para \"%s\""
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "SubscribМndose ao cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "DesubscribМndose do cartafol \"%s\""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Cartafol"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "A mensaxe foi recibida"
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Actualizar Lista"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Cartafoles"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "OpciСns de Vista"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "Xestionar SubscripciСns"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Subscribir"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Desubscribir"
+
 #: 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"
@@ -8074,54 +9709,71 @@ msgstr "CompoЯente de Evolution para o resume Executivo"
 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
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 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
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Amosar citas..."
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%I:%M %p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Resume de Correo"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Nome:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "InstalaciСn de Evolution"
+msgid "Summary Settings"
+msgstr "O resume contИn"
 
 #: my-evolution/e-summary-rdf.c:281
 #, fuzzy
@@ -8133,7 +9785,12 @@ msgstr "Houbo un erro cargando o ficheiro da axenda."
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Erro cargando a axenda</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "_Novo Cartafol"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Amosar tarefas"
@@ -8142,28 +9799,33 @@ msgstr "Amosar tarefas"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "SecciСns:"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %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"
+msgid "Print Summary"
+msgstr "_Resume"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "A impresiСn da mensaxe fallou"
 
 #: my-evolution/main.c:52
@@ -8171,6 +9833,42 @@ msgstr "A impresiСn da mensaxe fallou"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Movendo"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Filtros..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Filtros..."
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9363,129 +11061,145 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Respondida"
+msgid " _Remove"
+msgstr "Quitar"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Cartafoles"
+msgid "Add n_ew feed"
+msgstr "Respondida"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Todas Atendidas"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "Todas Atendidas"
+msgid "All _folders:"
+msgstr "Cartafoles"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Mostar cartafoles que comezan por:"
+msgid "All news _feeds:"
+msgstr "Respondida"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "OpciСns de Vista"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "Visualizar"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "Venres"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "mes"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr " unha semana"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Amosar tarefas"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "Amosar tarefas"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "MИrcores"
+msgid "Tasks "
+msgstr "Tarefas"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "mes"
+msgid "Units: "
+msgstr ""
+"\n"
+"  Unidade:  "
 
 #: 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 ""
+msgid "Weather settings"
+msgstr "Limpar a selecciСn"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr ""
-"Programar\n"
-"Hora"
+msgid "_Display folders:"
+msgstr "Mostar cartafoles que comezan por:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Amosar tarefas"
+msgid "_Display stations:"
+msgstr "OpciСns de Vista"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "con todos os cartafoles remotos activos"
+msgid "_Displayed feeds:"
+msgstr "Visualizar"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Amosar tarefas"
+msgid "_Five days"
+msgstr "Venres"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "Tarefas"
+msgid "_Mail"
+msgstr "Correo ElectrСnico"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  Unidade:  "
+msgid "_News Feeds"
+msgstr "_Novo Cartafol"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Outro"
+msgid "_One day"
+msgstr "MИrcores"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "Limpar a selecciСn"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "abril"
+msgid "_Schedule"
+msgstr ""
+"Programar\n"
+"Hora"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "con todos os cartafoles remotos activos"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "abril"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9502,7 +11216,17 @@ msgstr "Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar ReuniСn"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Cartafoles especiais"
@@ -9555,7 +11279,7 @@ msgid ""
 "`%s'."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9566,7 +11290,7 @@ msgstr ""
 "MСvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9575,7 +11299,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9586,57 +11310,80 @@ msgstr ""
 "directorio de Evolution. MСvao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Non И posible obter o cartafol: %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, 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
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copiar С cartafol"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Mover С cartafol"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Non foi posible borrar o cartafol `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Borrar despois de %s dМa(s)"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, 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
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "Abrindo cartafol %s"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Nome da regra: "
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nome do cartafol:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9650,7 +11397,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "O nome de cartafol indicado non И vАlido."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
@@ -9662,11 +11409,11 @@ msgstr ""
 "O tipo do cartafol seleccionado non И vАlido para\n"
 "a operaciСn solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Sen_tМtulo)"
 
@@ -9706,7 +11453,7 @@ msgstr ""
 "Importando %s\n"
 "Importando obxecto %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9755,7 +11502,7 @@ msgstr "AutomАtico"
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
@@ -9763,32 +11510,54 @@ msgstr "Seleccionar un ficheiro"
 msgid "File type:"
 msgstr "Tipo do ficheiro:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Non se pode inicializar o compoЯente de correo de Evolution."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 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:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9798,88 +11567,104 @@ msgstr ""
 "en grupo para xestiСn de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Ir С cartafol..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, 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
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Traballar desconectado"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, 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
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views 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:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "Aceptar"
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "Contidos da mensaxe non vАlidos"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "Non se pode rexistrar o almacenamento coa shell"
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Erro xenИrico"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Crear novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9888,182 +11673,168 @@ msgstr ""
 "©Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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:479
-#, fuzzy
-msgid "Rename"
-msgstr "Nome da regra: "
-
-#: shell/e-shortcuts-view.c:479
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, 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
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Erro xenИrico"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non И vАlido"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "FunciСn non implementada neste almacenamento"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "OperaciСn non soportada"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non estА soportado neste almacenamento"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Non se atopou o cartafol indicado"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% Comp_leta:"
 
@@ -10085,10 +11856,6 @@ msgstr "Servidor:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nome do cartafol:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Tipo do cartafol:"
@@ -10102,17 +11869,29 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Preme en \"Importar\" para comezar a importar o ficheiro a Evolution. "
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Utilidade de ImportaciСn de Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Utilidade Importadora de Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Seleccionar un ficheiro"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "Benvido А Utilidade de ImportaciСn de Evolution.\n"
@@ -10134,10 +11913,11 @@ msgid "Don't ask me again"
 msgstr "Non preguntar de novo"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
-msgstr ""
+#, fuzzy
+msgid "Evolution can import data from the following files:"
+msgstr "CompoЯente de evolution para manexar o correo."
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10170,7 +11950,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:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10178,25 +11958,30 @@ msgstr ""
 "GraciЯas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Non se pode inicializar a shell de Evolution."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:216
+#: shell/main.c:229
 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:255
+#: shell/main.c:271
 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-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Copiar"
 
@@ -10213,11 +11998,11 @@ msgstr "Crear un novo contacto"
 msgid "Create new contact list"
 msgstr "Crear un novo contacto"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Cortar"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Cortar a selecciСn"
 
@@ -10226,78 +12011,121 @@ msgstr "Cortar a selecciСn"
 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:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Novas"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Pegar"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do cartafol"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Seleccionar Todo"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Borrar un contacto"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Enviar unha _mensaxe ao contacto..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Enviar mensaxe a un contacto"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "Enviar contacto a outro"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "_AcciСns"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Contactos..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Gardar como TarxetaV"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Buscar contactos"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -10307,112 +12135,131 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "Crear un novo Evento de todo o dМa"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Crear unha nova cita"
+msgid "Create a New _Task"
+msgstr "Crear unha nova tarefa"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crear unha nova cita"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "DМa"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Borrar esta cita"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ir Para"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Ir para atrАs no tempo"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Ir para diante no tempo"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Ir А _Data"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Ir para a data especificada"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Ir А hora actual"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Ir a Hoxe"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "_Mes"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nova Cita"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Nova Tarefa"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Imprimir Axenda"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Imprimir esta Axenda"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Previsualizar a ImpresiСn"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "InformaciСn Requerida"
+msgid "Print this calendar"
+msgstr "Imprimir esta Axenda"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Amosar un dМa"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "Semana Lab_oral"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "_Citas"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "_DМa"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "_Mes"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "InformaciСn Requerida"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "_Semana"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_Tarefa"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10423,15 +12270,16 @@ msgid "Close"
 msgstr "Pechar"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Pechar esta cita"
+#, fuzzy
+msgid "Close this item"
+msgstr "Borrar este elemento"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Borrar esta cita"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Borrar este elemento"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Barra de Ferramentas Principal"
 
@@ -10440,118 +12288,86 @@ msgstr "Barra de Ferramentas Principal"
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Gardar"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Gardar a tarefa e pechar a caixa de diАlogo"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Axuda"
-
 #: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "_ConfiguraciСn da ImpresiСn..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Gardar _Como..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Gardar o contacto e pechar a caixa de diАlogo"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "E_nviar contacto a outro..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Ver a axuda online"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Enviar unha _mensaxe ao contacto..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Borrar este elemento"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Eliminar..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Gardar a tarefa e pechar a caixa de diАlogo"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "E_nviar contacto a outro..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "Enviar unha _mensaxe ao contacto..."
@@ -10561,22 +12377,22 @@ msgstr "Enviar unha _mensaxe ao contacto..."
 msgid "Cancel Mee_ting"
 msgstr "Cancelar ReuniСn"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 #, fuzzy
 msgid "Cancel the meeting for this item"
 msgstr "Cambiar as propiedades deste cartafol"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Re-enviar como _AxendaV (AMаяAME)"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Re-enviar esta mensaxe"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10591,16 +12407,11 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr "_Programar ReuniСn"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "AMаяAME: Programar ReuniСn"
 
-#: 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-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10617,68 +12428,65 @@ msgid "Cancel the current mail operation"
 msgstr "Gardar o ficheiro actual"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Redactar"
-
-#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "Redactar unha nova mensaxe"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Baleirar _Lixo"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Esquecer _Contrasinais"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "Xestionar _SubcripciСns"
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de Cartafoles Virtuais..."
 
@@ -10703,97 +12511,108 @@ msgstr "Previsualizar"
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "SubscribМndose ao cartafol \"%s\""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Cambiar as propiedades deste cartafol"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Cortar"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Agochar Mensaxes S_eleccionadas"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Agochar Mensaxes _Borradas"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Agochar Mensaxes _Lidas"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Marcar Todas como L_idas"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Pegar o contido do cartafol"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccionar _Todo"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Seleccionar _FМo"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "Amosar _Todo"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "Agochar Mensaxes _Lidas"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Lista de mensaxes por fМos"
 
@@ -10802,7 +12621,7 @@ msgstr "Lista de mensaxes por fМos"
 msgid "_Expunge"
 msgstr "_Limpar"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Cartafol"
 
@@ -10810,11 +12629,11 @@ msgstr "_Cartafol"
 msgid "_Invert Selection"
 msgstr "_Inverter SelecciСn"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Lista de mensaxes por fМos"
@@ -11062,7 +12881,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Previsualiza a mensaxe que se vai imprimir"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11084,43 +12904,37 @@ msgstr "Imprimir Mensaxe"
 msgid "Previous Unread Message"
 msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Imprimir mensaxe..."
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "PrevisualizaciСn da ImpresiСn"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Responder"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "Mensaxe de servidor:"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Gardar a mensaxe nun novo ficheiro"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar as opciСns de pАxina para a impresora actual"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -11169,74 +12983,57 @@ msgstr "CartafolV sobre os _Destinatarios"
 msgid "VFolder on _Subject..."
 msgstr "CartafolV sobre o A_sunto"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copiar С cartafol"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro desde Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Mensaxes re-enviadas"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Mover С cartafol"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Visualizar"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Re-enviar Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "_Re-enviar Mensaxes"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Pechar esta fiestra"
 
-#: 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-messagedisplay.xml.h:4 ui/evolution.xml.h:11
-msgid "Customize"
-msgstr "Personalizar"
-
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vista"
 
@@ -11303,11 +13100,6 @@ msgstr "Encriptar con PGP"
 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"
@@ -11438,7 +13230,7 @@ msgstr "Campo _Responder-A"
 msgid "_Security"
 msgstr "_Seguridade"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -11472,15 +13264,28 @@ msgstr "Desubscribir"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "Asig_nar Tarefa (AMаяAME)"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "Nova Tarefa"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Borrar a tarefa"
+msgid "Cancel this task"
+msgstr "Nova Tarefa"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "Actualizar Lista"
@@ -11489,44 +13294,32 @@ msgstr "Actualizar Lista"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Abrir Obxectos Seleccionados"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Crear unha nova tarefa"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Borrar a tarefa"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, 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:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_Tarefa"
 
@@ -11564,186 +13357,167 @@ msgstr "Eliminar este atallo da barra de atallos"
 msgid "Create a new folder"
 msgstr "Creando un novo cartafol"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Borrar este elemento"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Visualizar un cartafol diferente"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "_SaМr"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "_Fiestra do Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "SaМr do programa"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "_IniciaciСn"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Importar un formato de ficheiro externo"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Abrir a mensaxe actual nunha nova fiestra"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Amosar informaciСn sobre o Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Toggle"
 msgstr "Posto"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mosta da barra de cartafoles"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mosta da barra de atallos"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 #, 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:35
-msgid "Using the _Calendar"
-msgstr "Uso da _Axenda"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "Uso do Cliente de _Correo"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Ver o cartafol seleccionado"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Acerca do Evolution..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (AMаяAME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Contacto (AMаяAME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "_Copiar"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Ir С Cartafol..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "_Importar ficheiro..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "м_ndice"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "_Mensaxe de correo"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "Mover"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Abrir..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "_Tarefa (AMаяAME)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Traballar desconectado"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "Cambiar as propiedades deste cartafol"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
-msgstr "_Preferencias de Correo..."
+msgid "Print summary"
+msgstr "Resume de Correo"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Ler"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "Preferencias do Resume Executivo..."
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
@@ -11778,6 +13552,30 @@ msgstr "Mensaxes"
 msgid "With Category"
 msgstr "Coa CategorМa"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Seleccionar un ficheiro"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "SecciСns:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zona horaria: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11785,10 +13583,6 @@ msgstr "Coa CategorМa"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Ocupado"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "FСra da Oficina"
@@ -11861,7 +13655,7 @@ msgstr "Todas Atendidas"
 msgid "_Current View"
 msgstr "_Vista Actual"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -11871,19 +13665,20 @@ msgstr "Definir Vistas"
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B de %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Hoxe"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "Aceptar"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
@@ -11970,35 +13765,33 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "Editor de contactos"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Gardar BЗsqueda"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "BЗsqueda Avanzada"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Gardar BЗsqueda"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "_Limpar"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Ver Todos"
 
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Avanzado..."
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "InformaciСn"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Advertencia"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Erro"
@@ -12016,10 +13809,15 @@ msgstr "Mensaxe"
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Bus_car"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "Asignar ND:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "O Servidor Persoal do Libro de Enderezos"
@@ -12040,6 +13838,307 @@ msgstr "init_corba(): non foi posible inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
+#~ msgid "RDF Summary"
+#~ msgstr "Resume RDF"
+
+#~ msgid "LDAP Server"
+#~ msgstr "Servidor LDAP"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Tipo de libro de enderezos descoЯecido"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "NingЗn (modo anСnimo)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Tipo de autenticaciСn descoЯecido"
+
+#~ msgid "Subtree"
+#~ msgstr "SubАrbore"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Tipo de Аmbito descoЯecido"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "AMаяAME Texto de axuda para Asignar ND aquМ"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "AMаяAME Texto de axuda para Servidor aquМ"
+
+#~ msgid "Root DN:"
+#~ msgstr "ND RaМz:"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "AMаяAME Texto de axuda para ND RaМz aquМ"
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "AMаяAME Texto de axuda para Porto aquМ"
+
+#~ msgid "Authentication:"
+#~ msgstr "AutenticaciСn:"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "AMаяAME Texto de axuda para CamiЯo aquМ"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Crear camiЯo se non existe."
+
+#~ 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."
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "AMаяAME Texto de axuda para Nome aquМ"
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "AMаяAME Texto de axuda para DescriciСn aquМ"
+
+#~ msgid "Name"
+#~ msgstr "Nome:"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Introduza o contrasinal %s"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "Nome contИn"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "Seleccionar nome desde:"
+
+#~ msgid "USA"
+#~ msgstr "Estados Unidos"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Cancelada"
+
+#~ msgid "Transparent"
+#~ msgstr "Transparente"
+
+#~ msgid "Opaque"
+#~ msgstr "Opaco"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "A clasificaciСn ten que ser 'PЗblica', 'Privada', 'Confidencial' ou "
+#~ "'Ningunha'"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "A transparencia ten que ser 'Transparente, 'Opaca' ou 'Ningunha'."
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Chifrar cando aparece a fiestra de alarma."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Preferencias da Axenda"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "OpciСns do navegador de Citas"
+
+#~ msgid "Defaults"
+#~ msgstr "OpciСns por defecto"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Lembrarme todas as citas"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minutos antes de que ocorran."
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Eliminada"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Nada"
+
+#~ msgid "Task"
+#~ msgstr "Tarefa"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Comp_leta:"
+
+#~ msgid "Transparency"
+#~ msgstr "Transparencia"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Esta mensaxe non estА dispoЯible actualmente."
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "O cartafol parece estar corrompido sen recuperaciСn posible."
+
+#~ msgid "All"
+#~ msgstr "Todas"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Almacenar bЗsqueda como CartafolV"
+
+#~ msgid "Resend"
+#~ msgstr "Re-enviar"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Xestor de Contas de Evolution"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "O %s, %s escribiu:"
+
+#~ msgid "Receiving"
+#~ msgstr "Recibindo"
+
+#~ msgid "Store"
+#~ msgstr "Almacenar"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Mostar cartafoles que comezan por:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "Conseguindo almacenamento para \"%s\""
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "InstalaciСn de Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %d de %B de %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "A impresiСn da mensaxe fallou"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Novo contacto"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "_Contacto"
+
+#~ msgid "Go to present time"
+#~ msgstr "Ir А hora actual"
+
+#~ msgid "W_ork Week"
+#~ msgstr "Semana Lab_oral"
+
+#~ msgid "_Day"
+#~ msgstr "_DМa"
+
+#~ msgid "_Week"
+#~ msgstr "_Semana"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Pechar esta cita"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "ConfiguraciСn da ImpresiСn"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Gardar a cita e pechar a caixa de diАlogo"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "_AcciСns"
+
+#~ msgid "Help"
+#~ msgstr "Axuda"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "E_nviar contacto a outro..."
+
+#~ msgid "See online help"
+#~ msgstr "Ver a axuda online"
+
+#~ msgid "Compose"
+#~ msgstr "Redactar"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Xestionar _SubcripciСns"
+
+#~ msgid "Show _All"
+#~ msgstr "Amosar _Todo"
+
+#, fuzzy
+#~ msgid "Print Message..."
+#~ msgstr "Imprimir mensaxe..."
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "PrevisualizaciСn da ImpresiСn"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "_Re-enviar Mensaxes"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Personali_zar Barras de Tarefas..."
+
+#~ msgid "Customize"
+#~ msgstr "Personalizar"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Personalizar barras de tarefas"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Borrar a tarefa"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Gardar como outra cousa distinta"
+
+#~ msgid "Getting _Started"
+#~ msgstr "_IniciaciСn"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Uso do Xestor de Co_ntactos"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Uso da _Axenda"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Uso do Cliente de _Correo"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Cita (AMаяAME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contacto (AMаяAME)"
+
+#~ msgid "_Index"
+#~ msgstr "м_ndice"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Mensaxe de correo"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tarefa (AMаяAME)"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "_Preferencias de Correo..."
+
 #, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Preferencias alternativas"
@@ -12100,9 +14199,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Alarms timeout after"
 #~ msgstr "As alarmas saltan despois de"
 
-#~ msgid "Colors"
-#~ msgstr "Cores"
-
 #, fuzzy
 #~ msgid "Enable snoozing for"
 #~ msgstr "Activar adiando para"
@@ -12126,10 +14222,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Overdue Items:"
 #~ msgstr "Retrasar Cousas:"
 
-#, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "Rota de Tarefas"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Tempo ata que se deba facer"
 
@@ -12154,9 +14246,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ 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."
 
@@ -12224,12 +14313,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ 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"
 
@@ -12351,9 +14434,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ 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."
 
@@ -12402,15 +14482,12 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ 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>"
+#~ "-----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>"
@@ -12445,9 +14522,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "Crear unha nova axenda"
 
-#~ msgid "Day"
-#~ msgstr "DМa"
-
 #~ msgid "New _Event"
 #~ msgstr "Novo _Evento"
 
@@ -12460,9 +14534,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Save calendar as something else"
 #~ msgstr "Gardar axenda como outra cousa distinta"
 
-#~ msgid "Week"
-#~ msgstr "Semana"
-
 #~ msgid "_Open Calendar"
 #~ msgstr "_Abrir axenda"
 
@@ -12478,9 +14549,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ 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)"
 
@@ -12523,9 +14591,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Select everything"
 #~ msgstr "Seleccionar todo"
 
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "_PeticiСn de Tarefa (AMаяAME)"
-
 #~ msgid "_About..."
 #~ msgstr "_Acerca de..."
 
@@ -12559,12 +14624,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ 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"
 
@@ -12590,9 +14649,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ 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"
 
@@ -12641,9 +14697,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Reply"
 #~ msgstr "_Responder"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "_Gardar Mensaxe Como..."
-
 #~ msgid "_Threaded"
 #~ msgstr "_Por fМos"
 
@@ -12656,12 +14709,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ 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"
 
diff --git a/po/hu.po b/po/hu.po
index 5a4fbb76ce..b237e9a21c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.10.99\n"
-"POT-Creation-Date: 2001-08-21 14:59+0200\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2001-08-21 16:41+0200\n"
 "Last-Translator: AndrАs TМmАr <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -532,12 +532,12 @@ msgstr "_PostafiСk neve:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:89 my-evolution/my-evolution.glade.h:18
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "HozzА_adАs"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:94
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
@@ -657,18 +657,18 @@ 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:1599
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "ElsУdleges email"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "2. email"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
 #: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "3. email"
@@ -691,19 +691,19 @@ msgstr "CМm hozzАadАsa a lИtezУ %s nИvjegyjez"
 msgid "Querying Addressbook..."
 msgstr "A cМmjegyzИk lekИrdezИse..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "NИvjegy adatainak szerkesztИse"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "HozzАadАs a nИvjegyalbumhoz"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "Email cМm ЖsszefИsЭlИse"
 
@@ -864,8 +864,8 @@ msgstr "_NИvjegyek..."
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1319 mail/mail-config.glade.h:93
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_TЖrlИs"
@@ -926,94 +926,99 @@ msgstr "NИvjegy tЖrlИse?"
 msgid "This contact belongs to these categories:"
 msgstr "Ez a nИvjegy az alАbbi kategСriАkhoz tartozik:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
 #: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Asszisztens"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1558
-#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "эzleti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1559
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "2. эzleti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1560
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
 #: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "эzleti fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "VisszahМvАs"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "AutС"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "VАllalat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/contact-editor/e-contact-editor.c:1626
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Otthoni"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "2. Otthoni"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
 #: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
 #: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-#: addressbook/gui/contact-editor/e-contact-editor.c:1627
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "MАs"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
 #: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "EgyИb fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
 #: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "SzemИlyhМvС"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "ElsУdleges"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
 #: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "RАdiС"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
 #: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Nem sikerЭlt '%s' mappaЖsszegzУfАjt tЖrЖlni: %s"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Gyors nИvjegyhozzАadАs"
@@ -2319,8 +2324,8 @@ msgid "Success"
 msgstr "SikerЭlt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1651
-#: shell/e-storage.c:503
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -2328,7 +2333,7 @@ msgstr "Ismeretlen hiba"
 msgid "Repository offline"
 msgstr "Kapcsolat nИlkЭli tАrolС"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "JogosultsАgi hiba"
 
@@ -3032,9 +3037,9 @@ msgstr "Nem megadott"
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1416
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
 #: mail/mail-accounts.c:144 mail/mail-accounts.c:392
-#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1454
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
 #: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
@@ -3121,7 +3126,8 @@ msgstr "зj talАlkozС lИtrehozАsa"
 msgid "New _Appointment"
 msgstr "зj _talАlkozС"
 
-#: calendar/gui/component-factory.c:408 ui/evolution-tasks.xml.h:5
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "зj feladat lИtrehozАsa"
 
@@ -3133,23 +3139,23 @@ msgstr "зj _feladat"
 msgid "The URI that the calendar will display"
 msgstr "Az URI amit a naptАr megjelenМt"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr "Hangos riasztАs beАllМtАsai"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr "RiasztСЭzenet beАllМtАsai"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr "RiasztСlevИl beАllМtАsai"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr "RiasztСprogram beАllМtАsai"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr "Ismeretlen tМpusЗ riasztАs beАllМtАsai"
 
@@ -3334,7 +3340,7 @@ msgstr "talАlkozС vИge"
 msgid "hour(s)"
 msgstr "Сra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:114
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "perc"
 
@@ -3392,22 +3398,23 @@ msgid "Friday"
 msgstr "PИntek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Hide completed tasks after"
-msgstr "Befejezett feladatok elrejtИse"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Hours"
 msgstr "Сra mЗlva"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "perc mЗlva"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "HИtfУ"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "_LejАrt hatАridejШ feladatok:"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
@@ -3478,7 +3485,7 @@ msgid "Wednesday"
 msgstr "Szerda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "MunkahИt"
 
@@ -3515,17 +3522,18 @@ msgid "_General"
 msgstr "_Alap"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Befejezett feladatok elrejtИse"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
 msgstr "_H"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Other"
 msgstr "_MАs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Overdue tasks:"
-msgstr "_LejАrt hatАridejШ feladatok:"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
 msgstr "S_zo"
@@ -3954,7 +3962,7 @@ msgid "Status"
 msgstr "аllapot"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:84
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "TМpus"
@@ -4189,7 +4197,7 @@ msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1284
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "_MegnyitАs"
 
@@ -4201,7 +4209,7 @@ msgstr "K_ivАgАs"
 
 #: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
 #: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_MАsolАs"
@@ -4209,7 +4217,7 @@ msgstr "_MАsolАs"
 #: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
 #: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
 #: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
 #: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_BeillesztИs"
@@ -4323,7 +4331,7 @@ msgid "New All Day _Event"
 msgstr "з_j egИsz napos esemИny"
 
 #: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "UgrАs a _mai napra"
 
@@ -4575,12 +4583,12 @@ msgstr "'%s' betЖltИsИhez szЭksИges eljАrАs nem tАmogatott"
 msgid "New _Appointment..."
 msgstr "зj _talАlkozС..."
 
-#: calendar/gui/gnome-cal.c:1258
+#: calendar/gui/gnome-cal.c:1260
 #, 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:1269
+#: calendar/gui/gnome-cal.c:1271
 #, 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"
@@ -4641,7 +4649,7 @@ msgstr "oktСber"
 msgid "September"
 msgstr "szeptember"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr "A szervezУt be kell АllМtani."
 
@@ -4983,7 +4991,12 @@ msgstr ""
 "a has-categories? minden argumentumakИnt karakterlАncot vАr, vagy csak "
 "egyetlen logikai hamis (#f) ИrtИket"
 
-#: calendar/pcs/query.c:967
+#: calendar/pcs/query.c:805
+#, fuzzy
+msgid "is-completed? expects 0 arguments"
+msgstr "a time-now 0 argumentumot vАr"
+
+#: calendar/pcs/query.c:1008
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "A keresИsi kifejezИs kiИrtИkelИse nem logikai ИrtИkre vezetett"
 
@@ -5444,7 +5457,7 @@ msgstr "Ismeretlen hitelesМtИsi Аllapot."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "JelszС"
 
@@ -6056,7 +6069,7 @@ msgstr "Nem sikerЭlt %s mappa ЖsszefoglalСjАt elkИszМteni: %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:1550
+#: camel/providers/local/camel-spool-summary.c:931
 msgid "Synchronizing folder"
 msgstr "MappaszinkronizАlАs"
 
@@ -6267,35 +6280,35 @@ msgstr "Ez a beАllМtАs sima szЖveges jelszСt hasznАl az NNTP kiszolgАlhoz."
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Nem sikerЭlt .newsrc fАjlt lИtrehozni %s szАmАra: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:190
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "POP ЖsszefoglalС letЖltИse"
 
-#: camel/providers/pop3/camel-pop3-folder.c:196
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nem sikerЭlt az Зj levelek ellenУrzИse a POP kiszolgАlСn: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:236
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nem sikerЭlt megnyitni a mappАt: az Эzenetlista nem teljes."
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nem sikerЭlt letЖlteni a levelet: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nem sikerЭlt letЖlteni a levelet a %s POP kiszolgАlСrСl: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nincs %s azonosМtСjЗ levИl"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d. POP levИl letЖltИse"
@@ -6313,7 +6326,7 @@ msgstr "Az Эzenetek maradjanak meg a kiszolgАlСn is"
 msgid "Delete after %s day(s)"
 msgstr "TЖrlИs a kiszolgАlСrСl %s nap mЗlva"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:52
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -6407,7 +6420,7 @@ msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6460,7 +6473,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "LevИlkЭldИs a sendmail programon keresztЭl"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:64
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -6862,21 +6875,21 @@ msgstr "MentИs mАskИnt..."
 msgid "Warning!"
 msgstr "Figyelem!"
 
-#: composer/e-msg-composer.c:876
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "A fАjl lИtezik, felЭlМrod?"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "FАjlmentИsi hiba: %s"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "FАjlbetЖltИsi hiba: %s"
 
-#: composer/e-msg-composer.c:989
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -6884,16 +6897,16 @@ msgstr ""
 "Nem sikerЭlt megnyitni az ehhez a postafiСkhoz tartozС piszkozatok mappАt.\n"
 "SzeretnИd hasznАlni az alapИrtelmezett piszkozatok mappАt?"
 
-#: composer/e-msg-composer.c:1042
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "FАjlelИrИsi hiba: %s"
 
-#: composer/e-msg-composer.c:1050
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nem sikerЭlt betЖlteni a levelet a szerkesztУbУl"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -6902,7 +6915,7 @@ msgstr ""
 "Nem sikerЭlt keresni a fАjlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1062
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -6911,7 +6924,7 @@ msgstr ""
 "Nem sikerЭlt csonkolni a  fАjlt: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -6920,15 +6933,16 @@ msgstr ""
 "Hiba a levelek automatikus mentИse kЖzben: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1171
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Az EvolЗciС talАlt egy elУzУ munkafolyamatbСl szАrmazС mentetlen fАjlokat.\n"
 "SzeretnИd visszaАllМtani Уket?"
 
-#: composer/e-msg-composer.c:1319
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -6938,24 +6952,24 @@ msgstr ""
 "\n"
 "Akarod menteni a vАltozАsaidat?"
 
-#: composer/e-msg-composer.c:1326 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "EvolЗciС"
 
-#: composer/e-msg-composer.c:1349
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "FАjl megnyitАs"
 
-#: composer/e-msg-composer.c:1498
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "FАjl beillesztИse"
 
-#: composer/e-msg-composer.c:1874 composer/e-msg-composer.c:2315
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "LevИl МrАsa"
 
-#: composer/e-msg-composer.c:2405
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Nem sikerЭlt lИtrehozni a levИlМrС ablakot."
 
@@ -7223,7 +7237,7 @@ msgstr ""
 "LИpj vissza, Иs adj meg egy ИrvИnyes mappanevet, ahovА a leveleket kИred."
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:808
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "VАlassz mappАt"
 
@@ -7540,12 +7554,12 @@ msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "HoppА! LegalАbb egy mappАt meg kell adnod, mint forrАst."
 
 #: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "ImportАlАs"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
 #: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "LevИl"
@@ -7574,11 +7588,11 @@ msgstr ""
 "Az EvolЗciС GnomeCard fАjlokat talАlt.\n"
 "SzeretnИd ezeket az EvolЗciСba importАlni?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "BeАllМtАsok"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7675,129 +7689,129 @@ msgstr "\"%s\" tulajdonsАgai"
 msgid "Properties"
 msgstr "TulajdonsАgok"
 
-#: mail/folder-browser.c:233 mail/mail-display.c:281
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nem sikerЭlt lИtrehozni az ideiglenes kЖnyvtАrat: %s"
 
-#: mail/folder-browser.c:906
+#: mail/folder-browser.c:909
 msgid "Create vFolder from Search"
 msgstr "VMappa gyАrtАsa keresИsbУl"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "VMappa a _tАrgyra"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _feladСra"
 
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _cМmzettekre"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelezУlistАra"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "SzШ_rУ a tАrgyra"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "SzШrУ a f_eladСra"
 
-#: mail/folder-browser.c:1272
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "SzШrУ a _cМmzettekre"
 
-#: mail/folder-browser.c:1275
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "SzШrУ a _levelezУlistАra"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "S_zerkesztИs Зj levИlkИnt..."
 
-#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "M_entИs mАskИnt..."
 
-#: mail/folder-browser.c:1290
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_NyomtatАs"
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_VАlasz a feladСnak"
 
-#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "VАlasz a _listАnak"
 
-#: mail/folder-browser.c:1299 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "VАlasz _mindenkinek"
 
-#: mail/folder-browser.c:1301
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "TovАbbМtАs"
 
-#: mail/folder-browser.c:1304 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/folder-browser.c:1306 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "_Olvasatlan"
 
-#: mail/folder-browser.c:1308
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/folder-browser.c:1310
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr "_Nem fontos"
 
-#: mail/folder-browser.c:1315
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "а_thelyezИs mappАba..."
 
-#: mail/folder-browser.c:1317
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_MАsolАs mappАba..."
 
-#: mail/folder-browser.c:1321 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_VisszaАllМtАs"
 
-#: mail/folder-browser.c:1326
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "FeladС hozzАadАsa a cМmjegyzИkhez"
 
-#: mail/folder-browser.c:1331
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "SzШrУk alkalmazАsa"
 
-#: mail/folder-browser.c:1335
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "S_zabАly gyАrtАsa levИlbУl"
 
-#: mail/folder-browser.c:1493
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "SzШrУ a levelezУlistАra"
 
-#: mail/folder-browser.c:1494
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "VMappa a levelezУlistАra"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "SzШrУ a levelezУlistАra (%s)"
 
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VMappa a levelezУlistАra (%s)"
@@ -7866,15 +7880,15 @@ msgid "Evolution News Editor"
 msgstr "EvolЗciС News-szerkesztУ"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "EvolЗciС PostafiСk-szerkesztУ"
 
-#: mail/mail-account-gui.c:998
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "AlАМrАs mentИse"
 
-#: mail/mail-account-gui.c:1004
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -7884,6 +7898,10 @@ msgstr ""
 "\n"
 "Akarod menteni a vАltozАsaidat?"
 
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
 #: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (alapИrtelmezett)"
@@ -7913,7 +7931,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "TИnyleg tЖrЖlni akarod ezt a news-hozzАfИrИst?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:759 mail/mail-config.glade.h:41
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "LevelezУ beАllМtАsai"
 
@@ -8151,7 +8169,7 @@ msgstr ""
 "csak az EvolЗciС programban jelenik meg."
 
 #. set window title
-#: mail/mail-config-druid.c:589
+#: mail/mail-config-druid.c:558
 msgid "Evolution Account Assistant"
 msgstr "EvolЗciС PostafiСk varАzslС"
 
@@ -8281,197 +8299,202 @@ msgstr "Piszkozatok mappa"
 msgid "E_nable"
 msgstr "E_ngedИlyezИs"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Az aktuАlis fАjl mentИse mАs nИven"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "SzerkesztИs..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "AktМv"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "DigitАlis azonosМtС szerzИse..."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "HTML alАМrАsfАjl:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "AzonosМtС"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "HTML levИlben"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "BeАgyazott"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "LevelezИs beАllМtАsa"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "PostafiСk helye"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "L_egyen ez az alapИrtelmezett postafiСk"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr "Legyen _betekintУ ablaktАbla alapИrtelmezИs szerint"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr "A leveleket _szАlankИnt rendezze alapИrtelmezИs szerint"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "NNTP kiszolgАlС:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "EgyИb informАciС"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "PGP kulcs azonosМtСja:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "VАlassz egy szМnt"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "KИrdez, ha Э_res tАrggyal akarod elkЭldeni a levelet"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "KИrdez, ha csak _titkos mАsolat szerepel a cМmzettek kЖzЖtt"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "IdИzet"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Levelek fogadАsa"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Levelek fogadАsa"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "FogadАs beАllМtАsai"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "SzЭksИges informАciС"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "BiztonsАgos MIME"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "BiztonsАg"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "VАlassz egy szШrУnaplСfАjlt"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "VАlaszd ki a PGP programot"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "LevИl kЭldИse"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "LevИl kЭldИse"
 
-#: mail/mail-config.glade.h:72 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "ElkЭldve"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "ElkЭldЖtt levelek Иs piszkozatok"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "ElkЭldЖtt levelek mappАja"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "KiszolgАlС beАllМtАsa"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "KiszolgАlС tМpusa: "
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
 msgstr "A kiszolgАlС megkЖveteli a _hitelesМtИst"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "AlАМrАs fАjl:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "ForrАs"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "ForrАsinformАciС"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "ForrАsok"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "KЭlЖnleges mappАk"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "SzabvАnyos Unix mbox"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr "BiztonsАgos kapcsolat hasznАlata (_SSL)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8481,103 +8504,103 @@ msgstr ""
 "\n"
 "A folytatАshoz kattints a \"TovАbb\" gombra."
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "_Mindig tЖltse le a kИpeket a hАlСzatrСl"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
 msgstr "Az Зj _levelek automatikus lekИrdezИse minden"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
 msgstr "_TАmogatott tМpusok detektАlАsa"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
 msgstr "_EmailcМm:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
 msgstr "_Kuka ЭrМtИse kilИpИskor"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Full Name:"
 msgstr "_Teljes nИv:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "_HTML alАМrАs:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr "_IdИzetek kiemelИse"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
 msgstr "_GИp:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
 msgstr "_KИpek betЖltИse, ha a feladС szerepel a cМmjegyzИkben"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr "SzШrУmШveletek _naplСzАsa ide:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
 msgstr "_VАrakozАs a levИl olvasottkИnt megjelЖlИse elУtt:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "_NИv:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr "_Soha ne tЖltse le a kИpeket a hАlСzatrСl"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Organization:"
 msgstr "_Szervezet:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr "_PGP program elИrИsi Зtja:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "з_tvonal:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr "_PGP jelszС megjegyzИse kilИpИsig"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_JelszС megjegyzИse"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "A levelet _HTML formАtumban kЭldi alapИrtelmezИskИnt."
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "A_lАМrАs fАjl:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "_FelhasznАlСnИv:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr "helykitЖltУ"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "mАsodperc."
 
@@ -8874,7 +8897,7 @@ msgstr "%d / %d Эzenet kЭldИse"
 msgid "Failed on message %d of %d"
 msgstr "Hiba a %d / %d ЭzenetnИl"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "KИsz."
 
@@ -8934,30 +8957,35 @@ msgstr "%s mappa lИtrehozАsa"
 msgid "Removing folder %s"
 msgstr "%s mappa eltАvolМtАsa"
 
-#: mail/mail-ops.c:1600
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "MappaszinkronizАlАs"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Mappa frissМtИse"
 
-#: mail/mail-ops.c:1636
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Mappa tisztМtАsa"
 
-#: mail/mail-ops.c:1685
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s levИl letЖltИse"
 
-#: mail/mail-ops.c:1752
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d levИl letЖltИse"
 
-#: mail/mail-ops.c:1838
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d levИl mentИse"
 
-#: mail/mail-ops.c:1918
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -8966,7 +8994,7 @@ msgstr ""
 "Nem sikerЭlt lИtrehozni a kimeneti fАjlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -8975,11 +9003,11 @@ msgstr ""
 "Hiba a levelek mentИse kЖzben: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "MellИklet mentИse"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -8988,12 +9016,12 @@ msgstr ""
 "Nem lehet lИtrehozni a kimeneti fАjlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nem sikerЭlt az adatok kiМrАsa: %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "SzИtkapcsolСdАs %s kiszolgАlСval"
@@ -9050,7 +9078,7 @@ msgstr "FrissМtИs folyamatban..."
 msgid "Waiting..."
 msgstr "VАrakozАs..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "MegszakМtva"
 
@@ -9149,7 +9177,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%Y %d %b"
 
-#: mail/message-list.c:2314
+#: mail/message-list.c:2312
 msgid "Generating message list"
 msgstr "LevИllista lИtrehozАsa"
 
@@ -9262,7 +9290,7 @@ msgstr "%l:%M%p"
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "жsszegzИs a levelekrУl"
 
@@ -9271,7 +9299,7 @@ msgstr "жsszegzИs a levelekrУl"
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
 #: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:602
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS:ZSAM:EGAA"
 msgstr "LHBP:LHSY"
 
@@ -9308,8 +9336,9 @@ msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Hiba az RDF letЖltИse kЖzben</b>"
 
 #: my-evolution/e-summary-rdf.c:479
-msgid "RDF Summary"
-msgstr "RDF ЖsszefoglalС"
+#, fuzzy
+msgid "News Feed"
+msgstr "HМrforrАsok"
 
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
@@ -9327,7 +9356,7 @@ msgstr "<dd><b>Az idУjАrАs-kiszolgАlС nem elИrhetУ</b></dd>"
 msgid "Weather"
 msgstr "IdУjАrАs"
 
-#: my-evolution/e-summary-weather.c:663
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "RИgiСk"
 
@@ -10665,7 +10694,7 @@ msgstr "BeИrkezett levelek"
 msgid "Outbox"
 msgstr "PostАzandС levelek"
 
-#: shell/e-local-storage.c:592
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Helyi mappц║k"
 
@@ -10768,25 +10797,25 @@ msgstr "Nem sikerЭlt mappАt ЖnmagАra mАsolni."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Nem lehet a mappАt a sajАt almappАjАba Аthelyezni."
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Add meg a mappАt, amelybe \"%s\" mappАt mАsolod:"
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Mappa mАsolАsa"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Add meg a mappАt, amelybe \"%s\" mappАt mozgatod:"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Mappa АthelyezИse"
 
-#: shell/e-shell-folder-commands.c:357
+#: shell/e-shell-folder-commands.c:358
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -10795,30 +10824,30 @@ msgstr ""
 "Nem sikerЭlt tЖrЖlni a mappАt:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "'%s' mappa tЖrlИse"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "TИnyleg tЖrЖlni akarod ezt a mappАt: '%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:458
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "%s mappa АtnevezИse"
 
-#: shell/e-shell-folder-commands.c:462 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "аtnevezИs"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:470
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "MappanИv:"
@@ -10852,7 +10881,7 @@ msgstr ""
 msgid "New..."
 msgstr "зj..."
 
-#: shell/e-shell-folder-title-bar.c:577 shell/e-shell-folder-title-bar.c:578
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(NИvtelen)"
 
@@ -10892,7 +10921,7 @@ msgstr ""
 "%s importАlАsa\n"
 "%d. elem importАlАsa."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -10961,7 +10990,19 @@ msgstr "VАlaszd ki az importАlАlandС adatok cИlkЖnyvtАrАt"
 msgid "Closing connections..."
 msgstr "Kapcsolatok bezАrАsa..."
 
-#: shell/e-shell-startup-wizard.c:539
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Nem sikerЭlt inicializАlni az EvolЗciС hИjat: %s"
+
+#: shell/e-shell-startup-wizard.c:558
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -10969,7 +11010,7 @@ msgstr ""
 "VАrj...\n"
 "MeglИvУ beАllМtАsok keresИse"
 
-#: shell/e-shell-startup-wizard.c:542
+#: shell/e-shell-startup-wizard.c:561
 msgid "Starting Intelligent Importers"
 msgstr "Az okos importАlСk indМtАsa"
 
@@ -11050,12 +11091,12 @@ msgstr ""
 "Az EvolЗciС kapcsolat nИlkЭli mСdban van. Kattints erre a gombra a hАlСzatra "
 "csatlakozАshoz."
 
-#: shell/e-shell.c:508
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nem sikerЭlt beАllМtani a helyi tАrterЭletet -- %s"
 
-#: shell/e-shell.c:1437
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11064,23 +11105,23 @@ msgstr ""
 "HoppА! Az '%s' nИzet vАratlanul meghalt. :-(\n"
 "Ez valСszМnШleg azt jelenti, hogy a %s komponens Жsszeomlott."
 
-#: shell/e-shell.c:1641 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1643
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr "иrvИnytelen argumentumok"
 
-#: shell/e-shell.c:1645
+#: shell/e-shell.c:1646
 msgid "Cannot register on OAF"
 msgstr "Nem sikerЭlt regisztrАlni az OAF-ban"
 
-#: shell/e-shell.c:1647
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr "A beАllМtАsok adatbАzisa nem talАlhatС"
 
-#: shell/e-shell.c:1649 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "аltalАnos hiba"
 
@@ -11201,46 +11242,51 @@ msgstr "IndМtСikonok"
 msgid "(No name)"
 msgstr "(nИvtelen)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Nincs hiba"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "A megadott nИven mАr lИtezik mappa"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "A megadott mappatМpus nem jС"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "I/O hiba"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Nincs elИg hely a mappa elkИszМtИsИhez"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "A megadott mappa nem talАlhatС"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "A funkciС nincs mИg ebben a tАrolСban megМrva"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "A mШvelet nem tАmogatott"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "A megadott tМpus nem tАmogatott ebben a tАrolСban."
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:511
 msgid "The specified folder cannot be modified or removed"
 msgstr "A megadott mappa nem mСdosМthatС vagy tЖrЖlhetУ"
 
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Nem lehet a mappАt a sajАt almappАjАba Аthelyezni."
+
 #: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
@@ -11400,7 +11446,7 @@ msgstr "зj cМmlista kИszМtИse"
 msgid "Cut"
 msgstr "KivАgАs"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:9
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "KijelЖlИs kivАgАsa"
 
@@ -11416,7 +11462,7 @@ msgstr "зj lista"
 msgid "Paste"
 msgstr "BeillesztИs"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:22
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "VАgСlap beillesztИse"
 
@@ -11464,7 +11510,7 @@ msgstr "LeАllМtАs"
 msgid "Stop Loading"
 msgstr "BetЖltИs leАllМtАsa"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
@@ -11489,7 +11535,7 @@ msgstr "_CМmlista"
 msgid "_Forward Contact..."
 msgstr "NИvjegy _tovАbbМtАsa..."
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:39
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
@@ -11507,7 +11553,7 @@ msgstr "_NИvjegy keresИse"
 msgid "_Select All"
 msgstr "_Mindet kijelЖli"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
 #: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
 #: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
 #: ui/my-evolution.xml.h:9
@@ -11519,7 +11565,8 @@ msgid "Configure the calendar's settings"
 msgstr "A naptАr beАllМtАsai"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All-Day _Event"
+#, fuzzy
+msgid "Create a New All Day _Event"
 msgstr "зj egИsz _napos esemИmy lИtrehozАsa"
 
 #: ui/evolution-calendar.xml.h:5
@@ -11530,103 +11577,103 @@ msgstr "зj _feladat lИtrehozАsa"
 msgid "Create a _New Appointment"
 msgstr "зj _talАlkozС lИtrehozАsa"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "EgИsz napos esemИny lИtrehozАsa"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Nap"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Delete the appointment"
 msgstr "A talАlkozС tЖrlИse"
 
-#: ui/evolution-calendar.xml.h:12 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "UgrАs"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back"
 msgstr "UgrАs visszafelИ"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward"
 msgstr "UgrАs elУre "
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "_DАtumra ugrАs"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "UgrАs adott dАtumra"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to today"
 msgstr "UgrАs a mai napra"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "HСnap"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "зj talАlkozС"
 
-#: ui/evolution-calendar.xml.h:21 ui/evolution-tasks.xml.h:10
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 msgid "New Task"
 msgstr "зj feladat"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "A nyomtatandС naptАr nyomtatАsi kИpe"
 
-#: ui/evolution-calendar.xml.h:24 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
 msgstr "NyomtatАsi _kИp"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this calendar"
 msgstr "NaptАr nyomtatАsa"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Szabad/foglalt informАciС kЖzzИtИtele ehhez a naptАrhoz"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Egy nap mutatАsa"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Egy hСnap mutatАsa"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Egy hИt mutatАsa"
 
-#: ui/evolution-calendar.xml.h:30
-msgid "Show work week"
-msgstr "Egy munkahИt mutatАsa"
-
 #: ui/evolution-calendar.xml.h:31
+msgid "Show the working week"
+msgstr "A munkahИt mutatАsa"
+
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "HИt"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "_TalАlkozС..."
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "_NaptАr beАllМtАsai"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:41
 msgid "_Publish Free/Busy Information"
 msgstr "Szabad/foglalt informАciС _kЖzzИtИtele"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:42
 msgid "_Task..."
 msgstr "_Feladat..."
 
@@ -13068,6 +13115,12 @@ 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 "RDF Summary"
+#~ msgstr "RDF ЖsszefoglalС"
+
+#~ msgid "Show work week"
+#~ msgstr "Egy munkahИt mutatАsa"
+
 #~ msgid "USA"
 #~ msgstr "USA"
 
@@ -13247,9 +13300,6 @@ msgstr "init_bonobo(): a Bonobo inicializАlАsa nem sikerЭlt"
 #~ msgid "Print this Calendar"
 #~ msgstr "NaptАr nyomtatАsa"
 
-#~ msgid "Show the working week"
-#~ msgstr "A munkahИt mutatАsa"
-
 #~ msgid "W_ork Week"
 #~ msgstr "M_unkahИt"
 
diff --git a/po/it.po b/po/it.po
index 030eef6819..edd74f135f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Clara Tattoni <clara.tattoni@libero.it>, 2000
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 0.8\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -23,11 +24,11 @@ msgstr "Fabbrica per importare i file GnomeCard in Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importa i file GnomeCard in Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Tessera:"
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -35,7 +36,7 @@ msgstr ""
 "\n"
 "Nome:"
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -43,7 +44,7 @@ msgstr ""
 "\n"
 " Prefisso:"
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -51,7 +52,7 @@ msgstr ""
 "\n"
 " Dato:"
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -59,7 +60,7 @@ msgstr ""
 "\n"
 " Addizionale:"
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -67,7 +68,7 @@ msgstr ""
 "\n"
 " Famigila:"
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -75,7 +76,7 @@ msgstr ""
 "\n"
 " Suffisso:"
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -83,7 +84,7 @@ msgstr ""
 "\n"
 "Data di nascita:"
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -91,7 +92,7 @@ msgstr ""
 "\n"
 "Indirizzo:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -99,13 +100,13 @@ msgstr ""
 "\n"
 " Casella Postale: "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -113,7 +114,7 @@ msgstr ""
 "\n"
 " Via:   "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -121,7 +122,7 @@ msgstr ""
 "\n"
 " CittЮ:     "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -129,7 +130,7 @@ msgstr ""
 "\n"
 " Regione:       "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -137,7 +138,7 @@ msgstr ""
 "\n"
 " Codice di avviamento postale:  "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -145,7 +146,7 @@ msgstr ""
 "\n"
 " Stato:    "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -153,7 +154,7 @@ msgstr ""
 "\n"
 "Etichetta di spedizione: "
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -161,7 +162,7 @@ msgstr ""
 "\n"
 " Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -169,7 +170,7 @@ msgstr ""
 "\n"
 "Telefono:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -177,7 +178,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -185,7 +186,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -193,7 +194,7 @@ msgstr ""
 "\n"
 "Programma di posta: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -201,7 +202,7 @@ msgstr ""
 "\n"
 "Fuso orario: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -209,7 +210,7 @@ msgstr ""
 "\n"
 "Posizione Geografica: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -217,7 +218,7 @@ msgstr ""
 "\n"
 "Occupazione:"
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -225,7 +226,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -233,7 +234,7 @@ msgstr ""
 "\n"
 " Nome:"
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -241,7 +242,7 @@ msgstr ""
 "\n"
 " UnitЮ:"
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -249,7 +250,7 @@ msgstr ""
 "\n"
 " UnitЮ2:"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -257,7 +258,7 @@ msgstr ""
 "\n"
 " UnitЮ3:"
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -265,7 +266,7 @@ msgstr ""
 "\n"
 " UnitЮ4:"
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -273,7 +274,7 @@ msgstr ""
 "\n"
 "Categorie:"
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -291,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -299,7 +300,7 @@ msgstr ""
 "\n"
 "Stringa Unica: "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -321,8 +322,8 @@ msgstr "Inserire la password per %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -337,20 +338,20 @@ msgstr "Il cursore non puР essere caricato\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non caricato\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Impossibile avviare wombat"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco Indirizzi del Pilot"
 
@@ -400,202 +401,213 @@ msgstr "Fabbrica per il componente della rubrica di Evolution."
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contatti"
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tipo di rubrica sconosciuto"
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Errore nel caricare le informazioni dei filtri:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Nessuno (modo anonimo)"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Nuovo contatto"
 
-#: 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-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Tipo di auth sconosciuto"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Uno"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Modifica Rubrica"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 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 ""
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Account"
 
-#. 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.glade.h:3
+msgid "Add Addressbook"
+msgstr "Aggiungi rubrica"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "Host:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Sorgenti della Rubrica"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Avanzato..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Root DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Porta:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "Elimina"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "Uno"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 msgstr "Ambito della Ricerca:"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Autenticazione:"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Ambito della Ricerca:"
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "Seleziona Nomi"
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
-msgstr "Percorso:"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Do"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 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.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"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"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Sorgenti della Rubrica"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "Gestione degli Account"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Il Server richiede l'autenticazione"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Porta:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Salva Messaggio con nome..."
+
+#: addressbook/gui/component/addressbook-storage.c:138
 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:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Digitare la %s passphrase per %s"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Autenticazione"
+
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "Indirizzo Email:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Password"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubruca"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -603,48 +615,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Qualunque campo contiene"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Il nome contiene"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "Email contiene"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "Il nome contiene"
+msgid "Category is"
+msgstr "Categorie"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avanzato..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Categoria:"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI visualizzata dal Browser delle cartelle"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Senza nome)"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "Email 3"
 
@@ -668,19 +705,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "Modifica Rubrica"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Modifica Informazioni del Contatto"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Aggiungi ai Contatti"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Indirizzo Email:"
@@ -702,13 +739,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Rimuovere"
 
@@ -721,37 +755,56 @@ msgstr "Rimuovere Tutti"
 msgid "Send HTML Mail?"
 msgstr "Invio Email"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Altri Contatti"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Destinatari del messaggio:"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "contiene"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Seleziona Nomi"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "_Contatti"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "Seleziona un nome da:"
+msgid "F_ind"
+msgstr "Trova"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "Seleziona Nomi"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, 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/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "_Cartelle"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Destinatari del messaggio:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -766,8 +819,8 @@ msgid "Business _Fax"
 msgstr "_Fax Ufficio"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorie..."
 
@@ -776,16 +829,16 @@ msgid "Contact Editor"
 msgstr "Editor dei Contatti"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Dettagli"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Memorizza Come:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Generale"
 
@@ -810,239 +863,1239 @@ msgstr "Tipi di Telefono"
 msgid "Wants to receive _HTML mail"
 msgstr "Vuole ricevere messaggi in _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Indirizzo pagina web:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Indirizzo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "Nome dell'_Assistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "Co_mpleanno:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Ufficio"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contatti..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Elimina"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Dipartimento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Nome e Cognome..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Casa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_Titolo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Nome del _Manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "C_ellulare"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Nickname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Ufficio:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Professione:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_Coniuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "Indirizzo a cui _spedire"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Indirizzo pagina web:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Cancellare il Contatto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Questo contatto appartiene a queste categorie:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Assistente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Ufficio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Ufficio2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Fax Ufficio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Richiamare"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Ditta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax Casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Altro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Altro fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Impaginatore"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Principale"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Impossibile cancellare l'indice della cartella `%s': %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Aggiunta veloce di un Contatto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Modifica Interamente"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Nome e cognome"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "E-mail"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Indirizzo _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Assistente"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Automatico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Orientazione"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "Agosto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "anni"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Dimensione"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Invio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Email"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Controlla Indirizzo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "File"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+msgid "China"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Colori"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Copia in corso"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "_Stato:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Annullato"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "settimana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Generale"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Email"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "Ore"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Domenica"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Il piЫ basso"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Il piЫ basso"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "Aprile"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Marzo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Email"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Email"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Email"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Margini"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Maggio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "LunedЛ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Cellulare"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Manager"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Nuovi Messaggi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Seleziona _Thread"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Nuovo contatto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nuovi Messaggi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "PiЫ alto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "Aprile"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "Minuto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Adesso"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Incolla"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Carta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Verticale"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "dopo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Sezioni:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Punteggio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Generale"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr ""
+"Organizza\n"
+"Tempo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normale"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Invia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Dom"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Nickname"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Visto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Radio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Obiettivi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "A"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Oggi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Mar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Cestino"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Messaggi Multipli"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Seleziona Nomi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Visto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_CittЮ:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Casella Postale:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Stato/Provincia:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_ZIP/CAP:"
 
@@ -1133,6 +2186,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Rimuovere"
@@ -1143,7 +2197,7 @@ msgid "contact-list-editor"
 msgstr "Editor dei Contatti"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Editor dei Contatti"
@@ -1153,7 +2207,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1175,25 +2229,31 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "Altri Contatti"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Altri Contatti"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "Ricerca Avanzata"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Cerca"
 
@@ -1305,45 +2365,53 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salva come VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Apri"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Send contact to other"
-msgstr "_Invia contatto a altri..."
+msgid "Forward Contact"
+msgstr "Inoltra come"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
-msgid "Send message to contact"
+msgid "Send Message to Contact"
 msgstr "Invia un _messaggio al contatto..."
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Stampa"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Stampa _Busta..."
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Elimina"
 
@@ -1360,7 +2428,8 @@ 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
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -1369,7 +2438,7 @@ msgstr "Errore sconosciuto"
 msgid "Repository offline"
 msgstr "Non collegato"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Permesso negato"
 
@@ -1388,8 +2457,11 @@ msgid "Protocol not supported"
 msgstr "Operazione non supportata"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "Annullato"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1418,150 +2490,150 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
 "Errore nella lettura dei dati: \n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Cliccare qui per aggiungere un contatto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 #, fuzzy
 msgid "File As"
 msgstr "Memorizza Come:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Principale"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 #, fuzzy
 msgid "Business Phone"
 msgstr "Ufficio2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Richiamare"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "Ditta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 #, fuzzy
 msgid "Home Phone"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 #, fuzzy
 msgid "Business Address"
 msgstr "Ufficio2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 #, fuzzy
 msgid "Home Address"
 msgstr "Controlla Indirizzo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Ufficio2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Other Phone"
 msgstr "Altri Contatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Other Address"
 msgstr "Controlla Indirizzo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Sito Internet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Dipartimento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Ufficio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Posizione"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Professione"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Coniuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "Free-busy URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Completato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "Caricamento del calendario..."
@@ -1758,6 +2830,23 @@ msgstr "Larghezza:"
 msgid "_Font..."
 msgstr "Carattere..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Stampa calendario"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Stampa calendario"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Stampa _Busta..."
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1914,7 +3003,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "Impossibile inizializzare GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Impossibile inizializzare Bonobo"
@@ -1924,151 +3013,142 @@ 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:402
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:586
+#: calendar/gui/calendar-commands.c:604
 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:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "Pubblico"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "Pubblico"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "O"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Altezza"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "Normale"
 
-#: 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Basso"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "settimana"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Occupato"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Da cominciare"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "In corso"
 
-#: 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Completato"
 
-#: 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:893 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2079,29 +3159,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:981
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-"La classificazione dev'essere 'Pubblica', 'Privata', 'Confidenziale' oppure "
-"'nessuna'"
-
-#. 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 "Nessuno "
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2111,43 +3169,50 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "la prioritЮ dev'essere 'Alta', 'Normale', 'Bassa' oppure 'Non definita.'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Non definito"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "La trasparenza dev'essere 'Treasparente', 'Opaca' oppure 'Nessuna'."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Nessuno "
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Ricorre"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "SЛ"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "No"
 
@@ -2171,30 +3236,89 @@ msgstr "Settimana"
 msgid "Month View"
 msgstr "Mese"
 
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Summary contains"
+msgstr "Email contiene"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "Descrizione:"
+
+#: calendar/gui/cal-search-bar.c:58
+#, fuzzy
+msgid "Comment contains"
+msgstr "Il nome contiene"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Calendario"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Obiettivi"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Cartella virtuale sulla Mailng List"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Crea un nuovo appuntamento"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Nuovo Appuntamento"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Crea un nuovo obiettivo"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Nuovo Obiettivo"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "La URI che il calendario visualizzerЮ"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Avviso Sonoro"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Destinatari del messaggio:"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Visualizza opzioni"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2246,121 +3370,127 @@ msgstr "Ore"
 msgid "minutes"
 msgstr "minuti"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d giorni"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr " 1 giorno"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d settimane"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr " 1 settimana"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d ore"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 ora"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minuti"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d secondi"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " 1 secondo"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Esegui programma"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr " prima dell'inizio di un appuntamento"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr " dopo l'inizio di un appuntamento"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr " prima della fine di un appuntamento"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Indice:"
 
@@ -2369,12 +3499,11 @@ msgstr "Indice:"
 msgid "_Options..."
 msgstr "_Opzioni"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "dopo"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "prima"
 
@@ -2391,7 +3520,7 @@ msgstr "termine dell'appuntamento"
 msgid "hour(s)"
 msgstr "Ora (e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minuto(i)"
 
@@ -2408,204 +3537,230 @@ msgid "10 minutes"
 msgstr "10 minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 ore (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 ore"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minuti"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "Impostazioni _Posta..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Emette un suono quondo appare la finestra di avviso"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: 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"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Crea un nuovo appuntamento"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "Preferenze del Calendario"
+#, fuzzy
+msgid "Days"
+msgstr "Giorno"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Primo giorno della settimana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "VenerdЛ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+#, fuzzy
+msgid "Hours"
+msgstr "Ore"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
-msgid "Compress weekends in month view"
-msgstr "Comprimi i fine settimana"
+msgid "Minutes"
+msgstr "minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "Opzioni del navigatore delle date"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "LunedЛ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Predefinito"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Compiti scaduti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "Visualizza"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "Sabato"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Fine della giornata: "
+#, 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:19
-msgid "First day of week:"
-msgstr "Primo giorno della settimana:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Mostra i numeri delle settimane"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Ven"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "Inizio della giornata:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "VenerdЛ"
+#, fuzzy
+msgid "Su_n"
+msgstr "Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Domenica"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "Lun"
+#, fuzzy
+msgid "T_hu"
+msgstr "Gio"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "LunedЛ"
+#, fuzzy
+msgid "T_ue"
+msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Scadenze per oggi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "Compiti scaduti"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "GiovedЛ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Ricordami tutti gli appuntamenti"
+#, fuzzy
+msgid "Time"
+msgstr "Posizione"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"Fuso orario: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "Sab"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Suddivisione del tempo:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "Sabato"
+msgid "Time format:"
+msgstr "Formato del tempo:"
 
 #: 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/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "MartedЛ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Mostra i numeri delle settimane"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "MercoledЛ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "Inizio della giornata:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "_Settimana lavorativa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "Dom"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 ore (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Domenica"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 ore"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "Obiettivi"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "Scadenze per oggi"
+msgid "_Compress weekends in month view"
+msgstr "Comprimi i fine settimana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "Gio"
+#, fuzzy
+msgid "_Display"
+msgstr "Visualizza"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "GiovedЛ"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Fine della giornata: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "Posizione"
+msgid "_Fri"
+msgstr "Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Suddivisione del tempo:"
+#, fuzzy
+msgid "_General"
+msgstr "Generale"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Formato del tempo:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Nascondi i Messaggi _Cancellati"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"Fuso orario: "
+msgid "_Mon"
+msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "Mar"
+#, fuzzy
+msgid "_Other"
+msgstr "Altro"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "MartedЛ"
+#, fuzzy
+msgid "_Sat"
+msgstr "Sab"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "Mer"
+#, fuzzy
+msgid "_Task List"
+msgstr "Obiettivi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "MercoledЛ"
+#, fuzzy
+msgid "_Wed"
+msgstr "Mer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
-msgid "Work Week"
-msgstr "_Settimana lavorativa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "minuti prima che inizino."
+msgid "before the start of the appointment"
+msgstr " prima dell'inizio di un appuntamento"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2670,64 +3825,59 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Scadenza"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Modifica Appuntamenti"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Obiettivo - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce nell'agenda - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Niente indice"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2735,12 +3885,12 @@ msgstr ""
 "Esiste giЮ un file con questo nome.\n"
 "Sovrascriverlo?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2786,44 +3936,35 @@ msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 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
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Scegliere un file"
+msgid "Addressbook..."
+msgstr "Aggiungi rubrica"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "Sezioni:"
+msgid "Delegate To:"
+msgstr "Eliminato"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-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 ""
+msgid "Enter Delegate"
+msgstr "Eliminato"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Appuntamento"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Promemoria"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "Annulla Riunione"
@@ -2832,173 +3973,189 @@ msgstr "Annulla Riunione"
 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/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Occupato"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classificazione"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Confidenziale"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Data  e Ora"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "settimana"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vato"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Pub_blico"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Mostra"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "_Indice:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_Confidenziale"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "Ora di _fine:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "Nome del Gruppo:"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "Alimentazione della carta:"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "Partecipante Richiesto"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Partecipante Opzionale"
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "Non Partecipante"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentativo"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Eliminato"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "In corso"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Partecipante Richiesto"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Partecipante Opzionale"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Non Partecipante"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Visto"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Elimina..."
@@ -3041,19 +4198,18 @@ msgid "Role"
 msgstr "Ruolo"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: 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 "Organizzatore:"
@@ -3099,13 +4255,14 @@ msgstr "il"
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 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:1
+#, fuzzy
+msgid "A_dd"
+msgstr "Aggiungi"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3116,26 +4273,33 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Regole di ricorrenza"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Semplice ricorrenza"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Ricorrenza personalizzata"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Modifica"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Nessuna Ricorrenza"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Semplice ricorrenza"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "per"
@@ -3177,167 +4341,163 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_leta:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "Eliminato"
+msgid "Date Completed:"
+msgstr "Completato in data:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "Nessuno "
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "In corso"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Obiettivo"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_PrioritЮ:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "In corso"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Assegnato"
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descrizione:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Data di _inizio:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Confidenziale"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Sca_denza:"
 
-#: calendar/gui/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:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 #, fuzzy
 msgid "_Open"
 msgstr "Apri"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Taglia"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copia"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Elimina questo obiettivo"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Elimina questo obiettivo"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click 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"
@@ -3372,23 +4532,23 @@ msgstr "Posizione Geografica"
 msgid "Priority"
 msgstr "PrioritЮ"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Inizio"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Indice"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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"
@@ -3400,157 +4560,264 @@ msgstr "%02i divisioni per minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3306
-#, fuzzy
-msgid "New _Appointment"
-msgstr "Nuovo Appuntamento"
-
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Nuovo Evento dell'intera giornata"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Vai a _Oggi"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Vai alla data..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Elimina questo Appuntamento"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Rendi rimandabile questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Elimina questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Elimina Tutte le Ricorrenze"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "Indirizzo a cui _spedire"
+msgid "Meeting Information"
+msgstr "Nessuna informazione"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 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:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Annulla Riunione"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "T_ermine dell' appuntamento ore:"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:633
 #, fuzzy
-msgid "The message is not understandable."
-msgstr ""
-"Questo messaggio non ha l'oggetto.\n"
-"Inviare lo stesso?"
+msgid "Meeting Update Request"
+msgstr "Richiesta _appuntamento"
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "Indirizzo a cui _spedire"
+
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Annulla Riunione"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Scegliere un file"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Stampa Messaggio"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Informazione"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "TaskPad"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "era dopo"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "Richiesta _obiettivo"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Rispondi"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "La cartella appare irrimediabilmente corrotta."
+msgid "Task Cancellation"
+msgstr "Annulla Riunione"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Messaggio del Calendario"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Informazioni Utente"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Informazioni Utente"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "Free-busy URL"
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "Free-busy URL"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Stampa Messaggio"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "Impossibile aggiornare il file del calendario!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Completato in data:"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Impossibile aprire il file del calendario!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Data di spedizione"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3589,44 +4856,27 @@ msgstr "termine"
 msgid "date-start"
 msgstr "inizio"
 
-#: 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:252
-msgid "Category:"
-msgstr "Categoria:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Impossibile caricare l'obiettivo in `%s'"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 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/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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nuovo Appuntamento..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Il metodo richiesto per aprire `%s' non Х supportato"
@@ -3652,43 +4902,43 @@ msgid "Go To Date"
 msgstr "Vai alla data"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Luglio"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Giugno"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Marzo"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Maggio"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Novembre"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Ottobre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "Settembre"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "Vai a oggi"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3844,12 +5094,6 @@ msgstr "Ve"
 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 "Obiettivi"
-
 #. Day
 #: calendar/gui/print.c:1815
 #, fuzzy
@@ -3886,9 +5130,8 @@ msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
@@ -3901,7 +5144,7 @@ msgstr "Stampa questo articolo"
 msgid "Print Setup"
 msgstr "Impostazione pagina"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "La URI della cartella degli obiettivi da visualizzare"
 
@@ -3947,6 +5190,103 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMGVS"
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+#, fuzzy
+msgid "contains? expects 2 arguments"
+msgstr "Errore di sintassi nei parametri o negli argomenti"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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"
@@ -4012,7 +5352,7 @@ msgid "Unable to process spool folder"
 msgstr "Impossibile aprire la rubruca"
 
 #: camel/camel-filter-driver.c:667
-#, fuzzy
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Scaricamento del messaggio %s"
 
@@ -4053,7 +5393,7 @@ msgstr "Errore nel filtro di smistamento: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'esecuzione del filtro: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errore nell'esecuzione della ricerca con filtro: %s: %s"
@@ -4080,12 +5420,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) richiede un singolo risultato booleano"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "и stata effettuata una ricerca su un header sconosciuto: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo non valido in body-contains, ci si aspettava una stringa"
 
@@ -4201,13 +5541,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Non Х stata fornita alcuna password."
 
 #: 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
@@ -4225,16 +5565,16 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr "Impossibile creare file temporaneo: %s  "
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 #, fuzzy
 msgid "No plaintext to encrypt."
 msgstr "Cliccare l'icona per decifrare."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Nessun destinatario specificato"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4268,7 +5608,7 @@ msgid "Connection cancelled"
 msgstr "Connessione annullata"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
@@ -4279,7 +5619,7 @@ msgstr "(host sconosciuto)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
@@ -4413,42 +5753,69 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Autenticazione fallita"
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Password"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Sorgenti"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: 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:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necessita di un componente per lo username "
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necessita di un componente per l'host"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita di un componente per il percorso"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4461,12 +5828,12 @@ msgstr "Fornitore di cartelle email virtuali "
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per leggere la posta come una ricerca di un altro insieme di cartelle"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nessun fornitore disponibile per il protocollo `%s'"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4513,7 +5880,7 @@ msgstr "_Invia messaggio"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4521,7 +5888,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4567,51 +5934,51 @@ msgstr ""
 "х possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Risposta inaspettata dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "La risposta del server Х terminata troppo presto."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, 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:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, 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:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Impossibile creare la directory %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare l'indice per %s"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Salvataggio messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
@@ -4619,12 +5986,12 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: camel/providers/imap/camel-imap-folder.c:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Salvataggio messaggi"
@@ -4638,7 +6005,7 @@ msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 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
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Crea una nuova email"
@@ -4648,7 +6015,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Cartelle"
 
@@ -4690,7 +6057,7 @@ 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:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nessun supporto per il tipo di autenticazione %s"
@@ -4701,7 +6068,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sInserire la password IMAP per %s@%s"
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Non Х stata inserita la password."
 
@@ -4716,12 +6083,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Non Х presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4813,7 +6180,7 @@ msgstr "Impossibile accodare il messaggio alla cartella maildir: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4827,7 +6194,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4900,20 +6267,20 @@ msgstr "Impossibile aprire la casella di posta: %s: %s\n"
 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-mbox-folder.c:209
 #: 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"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Inpossibile accodare il messaggio al file mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4925,12 +6292,12 @@ msgstr ""
 "Impossibile prendere il messaggio: %s dalla cartella: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
@@ -4978,16 +6345,17 @@ msgstr "La Cartella `%s' non Х vuota.  Non cancellata."
 #. 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"
+#, fuzzy
+msgid "Summarizing folder"
 msgstr "Creazione indice della cartella"
 
 #: camel/providers/local/camel-mbox-summary.c:254
 #: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
-"Impossibile aprire la cartella: %s: indice creato a partire dalla posizione "
-"%ld: %s "
+"Impossibile aprire la cartella: %s: indice creato a partire dalla posizione %"
+"ld: %s "
 
 #: camel/providers/local/camel-mbox-summary.c:296
 #: camel/providers/local/camel-spool-summary.c:426
@@ -4998,24 +6366,22 @@ msgstr ""
 "cartella %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"
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
 msgstr "Impossibile creare indice per la cartella: %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:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Sincronizzazione cartella"
 
 #: 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "Impossibile aprire la cartella per la quale creare l'indice %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5118,6 +6484,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Impossibile creare indice per la cartella: %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5208,39 +6585,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Impossibile aprire o creare il file .newsrc per %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Ricezione indice POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Impossibile aprire la cartella: la lista dei messaggi era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "Nessun messaggio con uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Ricezione messaggio POP %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Impossibile inviare il messaggio: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Impossibile scaricare messaggi dal server POP %s: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "Nessun messaggio con uid %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Ricezione messaggio POP %d"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 #, fuzzy
 msgid "Message storage"
@@ -5256,7 +6633,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:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5351,7 +6728,7 @@ msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5406,7 +6783,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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5415,128 +6792,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:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Errore di sintassi, comando non riconosciuto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Errore di sintassi nei parametri o negli argomenti"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Comando non implementato"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "Parametro del comando non implementato"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr "Stato del sistema, o risposta di aiuto del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Messaggio di Aiuto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Servizio pronto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Il servizio sta chiudendo il canale di trasmissione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "Servizio non disponibile, chiusura del canale di trasmissione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "L'azione di posta richiesta Х corretta, completata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr "Utente non locale; inoltrare a <percorso-a-cui-inoltrare> "
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "L'azione di posta richiesta non Х stata effettuata: casella non disponibile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Azione richiesta non effettuata: casella non disponibile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "Azione richiesta interrotta: errore di processo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "Utente non locale; tentare <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Azione richiesta non effettuata: archivio di sistema insufficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "L'azione di posta richiesta Х stata interrotta: si Х ecceduta l'allocazione "
 "per l'archivio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "L'azione di posta richiesta non Х stata effettuata: il nome della casella "
 "non Х permesso"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Inizio dell'imput della posta, termin con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Transazione fallita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "и necessaria una password di transizione."
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "Il meccanismo di autenticazione И troppo debole"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "и richiesta la crittografia per il meccanismo di autenticazione richiesto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Autenticazione temporaneamente non riuscita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, 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:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5547,134 +6924,134 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Posta SMTP consegnata attraverso il programma %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 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:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 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 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Invio messaggio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, 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:744
-msgid "Error creating SASL authentication object."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autenticazione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "Cattiva risposta di autenticazione dal server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, 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:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Richiesta RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Errore nella risposta di RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Richiesta QUIT scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Errore nella risposta di QUIT: %s: non fatale<"
@@ -5704,7 +7081,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "allegato"
 
@@ -5737,53 +7114,53 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Cliccare qui per la rubrica"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Da:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Rispondi-a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5812,46 +7189,46 @@ msgid ""
 "%s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Avviso"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Impossibile scaricare messaggi dal server POP %s: %s"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5860,7 +7237,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5869,7 +7246,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5878,13 +7255,13 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5894,25 +7271,25 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "Inserici un file di testo..."
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Impossibile creare la finestra di composizione."
 
@@ -5940,57 +7317,103 @@ msgstr "biglietto da visita"
 msgid "calendar information"
 msgstr "informazioni sul calendario"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "contiene"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "non contiene"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "Il nome contiene"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Il nome contiene"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Destinatari"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Il nome contiene"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Il nome contiene"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "non contiene"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %m/%d/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5998,13 +7421,13 @@ 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:303
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -6102,7 +7525,7 @@ msgstr "una data relativa a quellla corrente"
 msgid "Compare against"
 msgstr "Confronta con"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "adesso"
 
@@ -6114,11 +7537,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<clicca qui per selezionare una data>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Regole dei Filtri"
 
@@ -6139,20 +7566,20 @@ 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:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Scegli Cartella"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Inserire la URI della Cartella"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<clicca qui per selezionare una cartella>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6173,64 +7600,53 @@ msgstr "Nome della Regola:"
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Esegui le azioni"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "se tutti i criteri sonon soddisfatti"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "se qualche criterio Х soddisfatto"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Aggiungi criterio"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 #, fuzzy
 msgid "incoming"
 msgstr "In entrata:"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 #, 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Modifica Filtri"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Modifica VFolder"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "In entrata:"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "In uscita:"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Cartelle Virtuali"
 
@@ -6254,195 +7670,196 @@ msgstr "con tutte le cartelle locali e  remote attive"
 msgid "with all local folders"
 msgstr "con tutte le cartelle locali"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Assegna Colore"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Assegna un punteggio"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Allegati"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copia nella Cartella"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Data di Ricezione"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Data di spedizione"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "non contiene"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "non finisce con"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "non esiste"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "non assomiglia a"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "non comincia per"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Non Esiste"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Bozza"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "finisce per"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Esistente"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "esiste"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Espressione"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "Х"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "Х maggiore di"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "Х minore di"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "non Х"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Corpo del messaggio"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "Header del messaggio"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "Il messaggio Х stato ricevuto"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "Il messaggio Х stato inviato"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Sposta nella Cartella..."
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "alle o dopo"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "Alle o prima"
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Leggi"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Corrispindenza con l'espressione regolare"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Risposto a"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Punteggio"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Mittente"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Imposta _Status"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Dimensione"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "Assomiglia a"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Source Account"
 msgstr "Account"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Specifica header"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "comincia per"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Oggetto"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "non contiene"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "non finisce con"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "non esiste"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "non assomiglia a"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "non comincia per"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "finisce per"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "esiste"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "Х maggiore di"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "Х minore di"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "non Х"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "Х"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "alle o dopo"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "Alle o prima"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "Assomiglia a"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "comincia per"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "era dopo"
@@ -6475,14 +7892,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "Email"
@@ -6509,12 +7925,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "Impostazioni..."
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6568,177 +7984,197 @@ msgstr "Fabbrica per il componente del Sommario della Posta"
 msgid "Mail configuration interface"
 msgstr "Configurazione della Posta"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Cartella virtuale sulla Mailng List"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "_ProprietЮ"
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Modifica le proprietЮ del file"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Invia _Messaggio"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Invia _Messaggio"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "ProprietЮ per \"%s\""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "ProprietЮ"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "_Crea Filtro dal Messaggio"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "Cartella Virtuale per _Oggetto"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "Cartella virtuale sul _Mittente"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "Cartella virtuale sui _Destinatari"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Cartella virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtra sull'Oggetto"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtro sul Mittente"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui Destinatari:"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:1273
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "Resend"
-msgstr "secondo"
+msgid "_Edit as New Message..."
+msgstr "Salva Messaggio con nome..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_Salva con nome..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Rispondi al Mittente"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 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
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Segna come _Non Letto"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Importante"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Segna come Non Letto"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Ripristina"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Aggiungi rubrica"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Crea Regola dal Messaggio"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "Cartella virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Cartella Virtuale sulla Mailng List (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Nessuna informazione"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6804,16 +8240,16 @@ msgid "Evolution News Editor"
 msgstr "Editor degli Account di Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Editor degli Account di Evolution"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "File con la firma:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6824,41 +8260,46 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr "(predefinito)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 #, fuzzy
 msgid "Disable"
 msgstr "Disabilita."
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "Sicuro di voler cancellare questo account?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Ripristina"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "Imposta come mio account predefinito"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sicuro di voler cancellare questo aaccount delle news?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Gestione degli Account di Evolution"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "Impostazioni _Posta..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6912,11 +8353,11 @@ msgstr ""
 "х necessario configurare un trasporto\n"
 "della posta prima di comporla."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Non Х stato impostato un sistema di trasporto per la posta"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6924,7 +8365,7 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6932,38 +8373,37 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr "х necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 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:653
-#, fuzzy, c-format
-msgid "On %s, %s wrote:"
-msgstr "Su %s, %s ha scritto:\n"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Messaggio inoltrato:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, 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
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6971,7 +8411,7 @@ msgstr ""
 "х possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -6980,25 +8420,42 @@ msgstr ""
 "х possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, 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:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Il messaggio Х stato ricevuto"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Avviso"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Non mostrare questo messagio in futuro."
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -7007,134 +8464,146 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtri..."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, 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
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Guida agli Account di Evolution"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
-msgid "Connecting to server..."
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
-msgid " Check for supported types "
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
+msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " color"
 msgstr "Colori"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Tipo on supportato"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Informazioni sull'Account"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Gestione degli Account"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Accounts"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Allegato"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Tipo di Autenticazione:"
 
-#: 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:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "Scrivi"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7150,295 +8619,271 @@ msgstr ""
 "\n"
 "Cliccare su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Visualizza"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 #, fuzzy
 msgid "Drafts"
 msgstr "Bozza"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Creazione nuova cartella"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:30
 #, fuzzy
-msgid "Edit..."
-msgstr "Modifica"
+msgid "E_nable"
+msgstr "Come _Tabella"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "Indirizzo Email:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Salva il file corrente con un nome diverso"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Modifica"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Nome e cognome:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "File con la firma:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr ""
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "IdentitЮ"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "_In linea"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, 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:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "Segna i messaggi come \"Letti\" dopo:"
+msgid "Make this my _default account"
+msgstr "Imposta come mio account predefinito"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Optional Information"
 msgstr "Nessuna informazione"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Organizzazione:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 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:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Prendi un colore"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 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:57
+#, fuzzy
+msgid "Prompt when sending messages with an _empty subject"
+msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "maildir"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "_Citato"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Ricezione"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "Informazioni Utente"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_Sicurezza"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Scegliere un file"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Scegliere un file binario PGP"
 
-#: 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:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Sent"
 msgstr "Visto"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Messaggio del Calendario"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Configurazione del Server"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Tipo di Server:"
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "Il Server richiede l'autenticazione"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "File con la firma:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Sorgenti"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Nessuna informazione"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Sorgenti"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "Cartelle Virtuali"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "File di mailbox standard per Unix"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+msgid "Use secure connection (_SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Username:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7446,15 +8891,117 @@ msgstr ""
 "\n"
 "Cliccare \"successivo\" per cominciare."
 
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "Controlla la posta automaticamente ogni"
+
+#: mail/mail-config.glade.h:93
+msgid "_Check for supported types"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "Indirizzo Email:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Nome e cognome:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "File con la firma:"
+
+#: mail/mail-config.glade.h:100
+msgid "_Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "Host:"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "Segna i messaggi come \"Letti\" dopo:"
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "Nome:"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Organizzazione:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "Percorso binario di PGP:"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Percorso:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Ricorda questa password"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Invia la posta in formato HTML come predefinito."
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "File con la firma:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Username:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "secondi."
 
@@ -7502,187 +9049,198 @@ msgstr "Impossibile creare la finestra di composizione."
 msgid "Could not create a S/MIME decode context."
 msgstr "Impossibile creare la finestra di composizione."
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Salva Allegati"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Salva su Disco..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Visualizza In linea"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "View Inline (via %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Visualizzatore Esterno"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Caricamento del contenuto del messaggio"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Contatto"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Obiettivo"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salva come..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Eliminato"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d secondi"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 #, 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
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "Indirizzo Email:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Da"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "Rispondi-a:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Programma GPG/PGP non disponibile."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "Messaggi cifrati non visualizzati"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Messaggio cifrato"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Cliccare l'icona per decifrare."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 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:1388
+#: mail/mail-format.c:1403
 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:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, 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:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformata."
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Non Х presente la cartella %s"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Apertura di '%s'"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7691,7 +9249,7 @@ msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sarЮ piЫ possibile riaprire questa cartella: %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7699,11 +9257,11 @@ msgstr ""
 "Se non si riesce piЫ ad aprire questa mailbox, puР essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "Configura %s"
@@ -7726,105 +9284,130 @@ msgstr ""
 "Errore durante l'operazione:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Ricorda questa password"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Sto lavorando"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Riconfigura Cartella"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Ricezione Email"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Invio messaggio"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Completato."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sposta messaggii in %s"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Spostamento in corso"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Copia in corso"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Cestino"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Apertura cartella %s"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "Apertura archivio %s"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Apertura cartella %s"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Apertura cartella %s"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Sincronizzazione cartella"
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Riconfigura Cartella"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Eliminazione cartella"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento del messaggio %s"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Scaricamento messaggi"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvataggio messaggi"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7833,7 +9416,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7842,11 +9425,11 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Salvataggio Allegati"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7855,87 +9438,83 @@ msgstr ""
 "Impossibile creare il file di output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Cerca"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Senza nome)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Messaggi Multipli"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "Inoltra"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "Trova"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "Percorso:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Annullamento..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Invia e Ricevi la posta"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Ricezione"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "Aggiornamento in corso..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "In Attesa..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "Invio"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr ""
 
@@ -7954,82 +9533,88 @@ msgstr "Messaggio inoltrato - %s"
 msgid "Forwarded message"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Nuova Cartella Virtuale"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Fwd: (nessun oggetto)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "Messaggio"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi Multipli Non Visti"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Messaggi Multipli"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "Il piЫ basso"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "PiЫ basso"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "PiЫ alto"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "Il piЫ alto"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Oggi %I:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l %M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "Salvataggio messaggi"
 
 #: mail/message-list.etspec.h:2
@@ -8044,39 +9629,78 @@ msgstr "Ricevuto"
 msgid "Size"
 msgstr "Dimensione"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Cartella"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "Archivio"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Visualizza le cartelle a partire da:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Sottoscrivere cartella \"%s\" "
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%s\""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Cartella"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "Il messaggio Х stato ricevuto"
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Aggiorna Lista"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Cartelle"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Visualizza opzioni"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Gestione _Sottoscrizioni..."
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Iscrizione"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Annulla iscrizione"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Componente di Evolution per il sommario esecutivo."
@@ -8085,56 +9709,73 @@ msgstr "Componente di Evolution per il sommario esecutivo."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Fabbrica per il componente del sommario esecutivo di Evolution"
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 "Impossibile inizializzare il componente del Sommario Esecutivo di Evolution."
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 #, fuzzy
 msgid "Appointments"
 msgstr "Appuntamento"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Mostra appuntamenti"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%a %I:%M %p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Niente indice"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Nome:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Installazione di Evolution"
+msgid "Summary Settings"
+msgstr "Email contiene"
 
 #: my-evolution/e-summary-rdf.c:281
 #, fuzzy
@@ -8146,7 +9787,12 @@ msgstr "Si И verificato un errore nel caricare il file del calendario."
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Errore nel caricare il calendario</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "_Nuova Cartella"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Mostra obiettivi"
@@ -8155,28 +9801,33 @@ msgstr "Mostra obiettivi"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Altro"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Sezioni:"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
-msgstr "%A, %e %B %Y"
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %d, %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolution"
+msgid "Print Summary"
+msgstr "Indice"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "Stampa Messaggio non riuscita"
 
 #: my-evolution/main.c:52
@@ -8184,6 +9835,42 @@ msgstr "Stampa Messaggio non riuscita"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Caratteri"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Spostamento in corso"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Filtri..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Filtri..."
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9373,129 +11060,145 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Risposto"
+msgid " _Remove"
+msgstr "Rimuovere"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Cartelle"
+msgid "Add n_ew feed"
+msgstr "Risposto"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Tutti i partecipanti"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "Tutti i partecipanti"
+msgid "All _folders:"
+msgstr "Cartelle"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Visualizza le cartelle a partire da:"
+msgid "All news _feeds:"
+msgstr "Risposto"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Visualizza opzioni"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "Visualizza"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "VenerdЛ"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "mese"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr " 1 settimana"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Mostra obiettivi"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "Mostra obiettivi"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "MercoledЛ"
+msgid "Tasks "
+msgstr "Obiettivi"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "mese"
+msgid "Units: "
+msgstr ""
+"\n"
+" UnitЮ:"
 
 #: 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 ""
+msgid "Weather settings"
+msgstr "Annulla la Selezione"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr ""
-"Organizza\n"
-"Tempo"
+msgid "_Display folders:"
+msgstr "Visualizza le cartelle a partire da:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Mostra obiettivi"
+msgid "_Display stations:"
+msgstr "Visualizza opzioni"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "con tutte le cartelle remote attive"
+msgid "_Displayed feeds:"
+msgstr "Visualizza"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Mostra obiettivi"
+msgid "_Five days"
+msgstr "VenerdЛ"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "Obiettivi"
+msgid "_Mail"
+msgstr "Email"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-" UnitЮ:"
+msgid "_News Feeds"
+msgstr "_Nuova Cartella"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Altro"
+msgid "_One day"
+msgstr "MercoledЛ"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "Annulla la Selezione"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "Aprile"
+msgid "_Schedule"
+msgstr ""
+"Organizza\n"
+"Tempo"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "con tutte le cartelle remote attive"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Altro"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "Aprile"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9512,7 +11215,17 @@ msgstr "Dettagli"
 msgid "Cancel Operation"
 msgstr "Annulla Riunione"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Cartelle Virtuali"
@@ -9563,7 +11276,7 @@ msgid ""
 "`%s'."
 msgstr "Si Х verificato un errore durante le lettura del file."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9574,7 +11287,7 @@ msgstr ""
 "Spostarla per permettere l'installazione\n"
 "dei file utente di Evolution."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9583,7 +11296,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9594,57 +11307,80 @@ msgstr ""
 "directorydi Evolution. Spostarla per permettere \n"
 "l'installazione dei file utente di Evolution."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "Impossibile copiare i file in\n"
 "`%s'"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copia nella Cartella"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Sposta nella Cartella..."
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Impossibile cancellare la cartella `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Elimina questo obiettivo"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, 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
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "Apertura cartella %s"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Nome della Regola:"
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nome della cartella:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9658,7 +11394,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "Il nome specificato della cartella non Х valido."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea nuova cartella"
 
@@ -9670,11 +11406,11 @@ msgstr ""
 "Il tipo di cartella selezionata non Х valido\n"
 "per l'operazione richiesta. "
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Nuovo..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Senza nome)"
 
@@ -9714,7 +11450,7 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9763,7 +11499,7 @@ msgstr "Automatico"
 msgid "Filename:"
 msgstr "Nome del file:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Scegliere un file"
 
@@ -9771,32 +11507,54 @@ msgstr "Scegliere un file"
 msgid "File type:"
 msgstr "Tipo di file:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "Scegli Cartella"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Impossibile inizializzare il componente della posta di Evolution."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non puР essere eseguito."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9806,88 +11564,103 @@ msgstr ""
 "per posta, calendario e gestione dei contatti\n"
 "nell'ambito dell'ambiente GNOME desktop.  "
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Vai alla cartella..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Crea un nuovo gruppo di collegamento"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, 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
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Non collegato"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#. 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s -Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 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:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "Contenuto del messaggio non valido"
+
+#: shell/e-shell.c:1646
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Errore generico"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento "
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Nome del Gruppo:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9896,182 +11669,168 @@ msgstr ""
 "Si desidera veramente rimuovere il gruppo\n"
 "`%s' dalla barra dei collegamenti?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Non rimuovere"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "Icone _Piccole"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra i collegamenti come icone piccole "
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "Icone _Grandi"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra i collegamenti come icone grandi"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Nuovo Gruppo..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Rimuovi Questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Rimuovi Questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "_Nascondi la Barra di Collegamento"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Nasconde la barra di collegamento"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Apri"
-
-#: shell/e-shortcuts-view.c:474
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, fuzzy
 msgid "Shortcuts"
 msgstr "_Barra di Collegamento"
 
-#: shell/e-shortcuts.c:984
-#, fuzzy
-msgid "Inbox"
-msgstr "mbox"
-
-#: shell/e-shortcuts.c:987
-#, fuzzy
-msgid "Contacts"
-msgstr "_Contatti"
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Senza nome)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Nessun errore"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Errore generico"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Esiste giЮ una cartella con questo nome"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Il tipo di cartella specificato non Х valido"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Errore I/O"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Spazio insufficiente per creare la cartella"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Cartella non trovata"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Funzione non implementata"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Tipo on supportato"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Cartella non trovata"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% Comp_leta:"
 
@@ -10093,10 +11852,6 @@ msgstr "Host:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nome della cartella:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Tipo di cartella:"
@@ -10111,17 +11866,29 @@ msgstr ""
 "Cliccare \"Importa\" per iniziare l'importazione del file in Evolution. "
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "UtilitЮ Inportazione di Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "UtilitЮ Importatore di Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Scegliere un file"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "UtilitЮ di Importazione di Evolution, benvenuti.\n"
@@ -10144,10 +11911,11 @@ 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 ""
+#, fuzzy
+msgid "Evolution can import data from the following files:"
+msgstr "Componente di Evolution per gestire la posta."
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10182,7 +11950,7 @@ msgstr ""
 "Ci auguriamo che apprezziate il risultato del nostro duro lavoro, e\n"
 "aspettiamo ansiosamente i vostri contributi!\n"
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10190,25 +11958,30 @@ msgstr ""
 "Grazie\n"
 "il Team di Evolution.\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Impossibile inizializzare la shell di Evolution."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Impossibile inizializzare la shell di Evolution."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Copia"
 
@@ -10225,11 +11998,11 @@ msgstr "Crea un nuovo contatto"
 msgid "Create new contact list"
 msgstr "Crea un nuovo contatto"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Taglia"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Taglia selezionato"
 
@@ -10238,78 +12011,122 @@ msgstr "Taglia selezionato"
 msgid "Delete selected contacts"
 msgstr "Cancella un contatto"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Nuovo contatto"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "News"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Incolla"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Incolla agli appunti"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Anteprime del messaggio da stampare"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Stampa contatti"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "Cancella un contatto"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Seleziona Tutto"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Cancella un contatto"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Invia un _messaggio al contatto..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "Cancella un contatto"
+
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Invia un _messaggio al contatto..."
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "_Invia contatto a altri..."
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Arresta caricamento"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "_Azioni"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "Sorgenti della _Rubrica..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Contatti"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Contatti..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "S_tampa..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Salva come VCard"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Ceca Contatti"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "S_trumenti"
 
@@ -10319,113 +12136,133 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "Crea un nuovo Evento dell'intera giornata"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Crea un nuovo appuntamento"
+msgid "Create a New _Task"
+msgstr "Crea un nuovo obiettivo"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "Giorno"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Elimina questo appuntamento"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Vai al"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Torna indietro nel tempo"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Vai avanti nel tempo"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Vai alla _Data"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Vai ad una data specifica"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Vai al presente"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Vai a Oggi"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "_Mese"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nuovo Appuntamento"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Nuovo Obiettivo"
+
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Anteprime del messaggio da stampare"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Stampa calendario"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Stampa questo calendario"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "_Anteprima di stampa"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "Informazioni Utente"
+msgid "Print this calendar"
+msgstr "Stampa questo calendario"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Mostra 1 giorno"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Mostra 1 mese"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Mostra 1 settimana"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Mostra la settimana lavorativa"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "_Settimana lavorativa"
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "Week"
+msgstr "_Settimana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "_Appuntamento"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "Impostazioni _Posta..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "_Giorno"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "_Mese"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Informazioni Utente"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "_Settimana"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_Obiettivo"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10436,15 +12273,16 @@ msgid "Close"
 msgstr "Chiudi"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Chiudi questo appuntamento"
+#, fuzzy
+msgid "Close this item"
+msgstr "Elimina quest'oggetto"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Elimina questo appuntamento"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Elimina quest'oggetto"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Barra dagli strimenti principale"
 
@@ -10453,117 +12291,85 @@ msgstr "Barra dagli strimenti principale"
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Stampa..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Salva"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Salva l'impegno e chiudi la finestra di dialogo"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Aiuto"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Stampa _Busta..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Salva _come..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Salva il contatto e chiudi la finestra di dialogo"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "_Invia contatto a altri..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Vedere aiuto in linea"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Invia un _messaggio al contatto..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Salva"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Elimina quest'oggetto"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Elimina..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Salva l'impegno e chiudi la finestra di dialogo"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "_Invia contatto a altri..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "Invia un _messaggio al contatto..."
@@ -10573,21 +12379,21 @@ msgstr "Invia un _messaggio al contatto..."
 msgid "Cancel Mee_ting"
 msgstr "Annulla Riunione"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Inoltra come v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Inoltra questo messaggio"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10602,16 +12408,11 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr "Pianifica una _Riunione"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "Pianifica una Riunione"
 
-#: 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-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10628,69 +12429,66 @@ msgid "Cancel the current mail operation"
 msgstr "Salva il file corrente"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Scrivi"
-
-#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "Scrivi un nuovo messaggio"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Vuota _Cestino"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Dimantica _Password"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "Gestione _Sottoscrizioni..."
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Messaggio"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Invia e Ricevi"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Invia la posta in coda e ricevi quella nuova"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor delle Cartelle Virtuali..."
 
@@ -10716,97 +12514,108 @@ msgstr "Anteprima"
 msgid "_Send / Receive"
 msgstr "_Invia e Ricevi"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "Sottoscrivere cartella \"%s\" "
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Taglia"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Nascondi i Messaggi _Selezionati"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Nascondi i Messaggi _Cancellati"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Nascondi i messaggi _Letti"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Segna _Tutti come Letti"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Incolla agli appunti"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleziona _Tutto"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Seleziona _Thread"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "Mostra _Tutto"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "Nascondi i messaggi _Letti"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "LIsta di Messaggi a Thread"
 
@@ -10814,7 +12623,7 @@ msgstr "LIsta di Messaggi a Thread"
 msgid "_Expunge"
 msgstr "_Elimina per sempre"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Cartelle"
 
@@ -10822,11 +12631,11 @@ msgstr "_Cartelle"
 msgid "_Invert Selection"
 msgstr "_Inverti Selezione"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_ProprietЮ"
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "LIsta di Messaggi a Thread"
@@ -11077,7 +12886,8 @@ 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"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Anteprime del messaggio da stampare"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11099,43 +12909,37 @@ msgstr "Stampa Messaggio"
 msgid "Previous Unread Message"
 msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Stampa Messaggio"
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "Anteprima di stampa"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Rispondi"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Rispondi a Tutti"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "Salva Messaggio con nome..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Salva il messaggio in una cartella specificata"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Imposta i parametri della pagina per la stampante corrente"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -11188,74 +12992,57 @@ msgstr "Cartella virtuale sui _Destinatari"
 msgid "VFolder on _Subject..."
 msgstr "Cartella Virtuale per _Oggetto"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Applica Filtri"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copia nella Cartella"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "_Crea Filtro dal Messaggio"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Messaggio inoltrato"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Messaggio"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Sposta nella Cartella..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Visualizza"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "Messaggio del Calendario"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "Messaggio del Calendario"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: 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-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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Visualizza"
 
@@ -11322,11 +13109,6 @@ msgstr "Cifra con PGP"
 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"
@@ -11457,7 +13239,7 @@ msgstr "Campo _Rispondi-a:"
 msgid "_Security"
 msgstr "_Sicurezza"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Aiuto"
 
@@ -11491,15 +13273,28 @@ msgstr "Annulla iscrizione"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "Asseg_na obiettivo"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "Nuovo Obiettivo"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Elimina questo obiettivo"
+msgid "Cancel this task"
+msgstr "Nuovo Obiettivo"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "Aggiorna Lista"
@@ -11508,44 +13303,32 @@ msgstr "Aggiorna Lista"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "_Apri i Selezionati"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Crea un nuovo obiettivo"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Elimina questo obiettivo"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, 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:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "Impostazioni _Posta..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_Obiettivo"
 
@@ -11583,186 +13366,167 @@ msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 msgid "Create a new folder"
 msgstr "Creazione nuova cartella"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Elimina quest'oggetto"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Visualizza un'altra cartella"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "E_sci"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Esci dal Programma"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "Primi _Passi"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Importa un formato di file esterno"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Invia il messaggio adesso"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Mostra informazioni su Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Invia un Bug Report"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "Invia un _Bug Report"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Inoltra un Bug Report usando Bug Buddy."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Toggle"
 msgstr "Ruolo"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostra/nasconde la barra delle cartelle"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostra/nasconde la barra dei collegamenti"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 #, 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:35
-msgid "Using the _Calendar"
-msgstr "Uso del _Calendario"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "Uso del programma di _Posta"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Mostra la cartella selezionata"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Informazioni su Evolution..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Appuntamento"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Contatto"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "_Copia"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "Barra delle _Cartelle"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Vai alla cartella..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "_Importa un file..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "_Indice"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "_Invia messaggio"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "Sposta"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nuovo"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Nuova Cartella"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Apri..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "_Barra di Collegamento"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Barra di Collegamento"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "_Obiettivo"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Non collegato"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "Cambia la vista con %s"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
-msgstr "Impostazioni _Posta..."
+msgid "Print summary"
+msgstr "Niente indice"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Leggi"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "Impostazioni Sommario Esecutivo..."
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
@@ -11804,6 +13568,30 @@ msgstr "Messaggio"
 msgid "With Category"
 msgstr "Categoria:"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Scegliere un file"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sezioni:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Fuso orario: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11811,10 +13599,6 @@ msgstr "Categoria:"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Occupato"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Assente"
@@ -11887,7 +13671,7 @@ msgstr "Tutti i partecipanti"
 msgid "_Current View"
 msgstr "Vista _Corrente"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11897,19 +13681,20 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr "LMMGVSD"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Adesso"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Oggi"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -11999,35 +13784,33 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "Editor dei Contatti"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Salva Ricerca"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "Ricerca Avanzata"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Salva Ricerca"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "_Annulla"
 
 #: 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"
 msgstr "Informazione"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Avviso"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Errore"
@@ -12045,10 +13828,15 @@ msgstr "Messaggio"
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_Cerca"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "Bind DN:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Server Personale della Rubrica"
@@ -12069,6 +13857,281 @@ msgstr "init_corba(): impossibile inizializzare GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 
+#~ msgid "RDF Summary"
+#~ msgstr "Indice RDF"
+
+#~ msgid "LDAP Server"
+#~ msgstr "LDAP Server"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Tipo di rubrica sconosciuto"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Nessuno (modo anonimo)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Tipo di auth sconosciuto"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Tipo di ambito sconosciuto"
+
+#~ msgid "Root DN:"
+#~ msgstr "Root DN:"
+
+#~ msgid "Authentication:"
+#~ msgstr "Autenticazione:"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Crea il path se non esiste"
+
+#~ 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."
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Inserire la password per %s"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "Il nome contiene"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "Seleziona un nome da:"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Annullato"
+
+#~ msgid "Transparent"
+#~ msgstr "Trasparente"
+
+#~ msgid "Opaque"
+#~ msgstr "Opaco"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "La classificazione dev'essere 'Pubblica', 'Privata', 'Confidenziale' "
+#~ "oppure 'nessuna'"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "La trasparenza dev'essere 'Treasparente', 'Opaca' oppure 'Nessuna'."
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Emette un suono quondo appare la finestra di avviso"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Preferenze del Calendario"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "Opzioni del navigatore delle date"
+
+#~ msgid "Defaults"
+#~ msgstr "Predefinito"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Ricordami tutti gli appuntamenti"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minuti prima che inizino."
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Eliminato"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Nessuno "
+
+#~ msgid "Task"
+#~ msgstr "Obiettivo"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Comp_leta:"
+
+#~ msgid "Transparency"
+#~ msgstr "Trasparenza"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr ""
+#~ "Questo messaggio non ha l'oggetto.\n"
+#~ "Inviare lo stesso?"
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "La cartella appare irrimediabilmente corrotta."
+
+#~ msgid "All"
+#~ msgstr "Tutti"
+
+#~ msgid "Edit"
+#~ msgstr "Modifica"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Archivia la ricerca come Cartella Virtuale"
+
+#, fuzzy
+#~ msgid "Resend"
+#~ msgstr "secondo"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Gestione degli Account di Evolution"
+
+#, fuzzy
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "Su %s, %s ha scritto:\n"
+
+#~ msgid "Receiving"
+#~ msgstr "Ricezione"
+
+#~ msgid "Store"
+#~ msgstr "Archivio"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Visualizza le cartelle a partire da:"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Installazione di Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %e %B %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Stampa Messaggio non riuscita"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Nuovo contatto"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "_Contatti"
+
+#~ msgid "Go to present time"
+#~ msgstr "Vai al presente"
+
+#~ msgid "W_ork Week"
+#~ msgstr "_Settimana lavorativa"
+
+#~ msgid "_Day"
+#~ msgstr "_Giorno"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Chiudi questo appuntamento"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "Impostazione pagina"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Salva l'appuntamento e chiudi la finestra di dialogo"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "_Azioni"
+
+#~ msgid "Help"
+#~ msgstr "Aiuto"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "_Invia contatto a altri..."
+
+#~ msgid "See online help"
+#~ msgstr "Vedere aiuto in linea"
+
+#~ msgid "Compose"
+#~ msgstr "Scrivi"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Gestione _Sottoscrizioni..."
+
+#~ msgid "Show _All"
+#~ msgstr "Mostra _Tutto"
+
+#, fuzzy
+#~ msgid "Print Message..."
+#~ msgstr "Stampa Messaggio"
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "Anteprima di stampa"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "Messaggio del Calendario"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Personali_zza barre degli strumenti..."
+
+#~ msgid "Customize"
+#~ msgstr "Personalizza"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Personalizza barre degli strumenti"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Elimina questo obiettivo"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Salva obiettivo come qualcos'altro"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Primi _Passi"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Uso del manger dei C_ontatti"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Uso del _Calendario"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Uso del programma di _Posta"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Appuntamento"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contatto"
+
+#~ msgid "_Index"
+#~ msgstr "_Indice"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Invia messaggio"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Obiettivo"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Impostazioni _Posta..."
+
 #, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Cambia preferenze"
@@ -12086,9 +14149,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ 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"
@@ -12129,9 +14189,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Alarms timeout after"
 #~ msgstr "Interruzione avviso sonoro dopo"
 
-#~ msgid "Colors"
-#~ msgstr "Colori"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "Attiva la suoneria per "
 
@@ -12150,9 +14207,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Overdue Items:"
 #~ msgstr "Compiti scaduti:"
 
-#~ msgid "TaskPad"
-#~ msgstr "TaskPad"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Cronometra fino al termine"
 
@@ -12177,9 +14231,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Edit the task"
 #~ msgstr "Modifica obiettivo"
 
-#~ msgid "Go to Today"
-#~ msgstr "Vai a Oggi"
-
 #~ msgid "Component successfully updated."
 #~ msgstr "Compnente aggiornata con successo."
 
@@ -12253,14 +14304,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgstr "label55"
 
 #, fuzzy
-#~ msgid "Summary contains"
-#~ msgstr "Email contiene"
-
-#, fuzzy
-#~ msgid "Comment contains"
-#~ msgstr "Il nome contiene"
-
-#, fuzzy
 #~ msgid "Has category"
 #~ msgstr "Categoria:"
 
@@ -12321,8 +14364,8 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ "\n"
 #~ "Just leave it blank for the default"
 #~ msgstr ""
-#~ "и possibile selezionare una pagina HTML diversa per lo sfondo del Sommario "
-#~ "Esecutivo.\n"
+#~ "и possibile selezionare una pagina HTML diversa per lo sfondo del "
+#~ "Sommario Esecutivo.\n"
 #~ "\n"
 #~ "Lasciare in bianco per la pagina predefinita. "
 
@@ -12375,15 +14418,13 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ "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"
+#~ "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."
 
@@ -12451,15 +14492,12 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (messagio inoltrato)"
 
-#~ 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>"
+#~ "-----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>"
@@ -12491,9 +14529,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "Crea un nuovo calendario"
 
-#~ msgid "Day"
-#~ msgstr "Giorno"
-
 #~ msgid "New _Event"
 #~ msgstr "Nuovo _Evento"
 
@@ -12521,9 +14556,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "FIXME: Address _Book..."
 
-#~ msgid "C_lear"
-#~ msgstr "_Annulla"
-
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "Controlla i Nomi"
 
@@ -12566,9 +14598,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Select everything"
 #~ msgstr "Seleziona ogni cosa"
 
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "Richiesta _obiettivo"
-
 #~ msgid "_About..."
 #~ msgstr "_Informazioni su"
 
@@ -12602,12 +14631,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ 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..."
@@ -12620,10 +14643,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgstr "_Elimina per sempre"
 
 #, fuzzy
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "Nascondi i Messaggi _Cancellati"
-
-#, fuzzy
 #~ msgid "Invert Selection"
 #~ msgstr "_Inverti Selezione"
 
@@ -12668,10 +14687,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "_Reply"
 #~ msgstr "_Rispondi"
 
-#, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Salva Messaggio con nome..."
-
 #~ msgid "_Threaded"
 #~ msgstr "A _Thread"
 
@@ -12684,12 +14699,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ 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"
 
diff --git a/po/ja.po b/po/ja.po
index 545858278b..4b23b30975 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Akira TAGOH <tagoh@gnome.gr.jp>, 2000-2001.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -21,11 +22,11 @@ msgstr "Evolution ╓ь VCard ╔у╔║╔╓╔К╓Р╔╓╔С╔щ║╪╔х╓╧╓К╔у╔║╔╞╔х╔Й"
 msgid "Imports VCard files into Evolution."
 msgstr "Evolution ╓ь VCard ╔у╔║╔╓╔К╓Р╔╓╔С╔щ║╪╔х"
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "л╬╩и: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +34,7 @@ msgstr ""
 "\n"
 "л╬а╟: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +42,7 @@ msgstr ""
 "\n"
 "  ╥и╬н(а╟╓д╓╠):     "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -49,13 +50,13 @@ msgstr ""
 "\n"
 "  ю╚:      "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -63,7 +64,7 @@ msgstr ""
 "\n"
 "  ╔у╔║╔ъ╔Й║╪л╬:     "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -71,7 +72,7 @@ msgstr ""
 "\n"
 "  ╥и╬н(╦Е╓д╓╠):     "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -79,7 +80,7 @@ msgstr ""
 "\n"
 "цбю╦фЭ: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -87,7 +88,7 @@ msgstr ""
 "\n"
 "╫╩╫Й:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -95,7 +96,7 @@ msgstr ""
 "\n"
 "м╧йьхж╧Ф:  "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -103,25 +104,25 @@ msgstr ""
 "\n"
 "  "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +130,7 @@ msgstr ""
 "\n"
 "  м╧йьхж╧Ф: "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -137,13 +138,13 @@ msgstr ""
 "\n"
 "  ╧Я:       "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -151,7 +152,7 @@ msgstr ""
 "\n"
 "ееоцхж╧Ф:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -159,7 +160,7 @@ msgstr ""
 "\n"
 "ееоцхж╧Ф:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -167,7 +168,7 @@ msgstr ""
 "\n"
 "╔А║╪╔К:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -175,7 +176,7 @@ msgstr ""
 "\n"
 "╔А║╪╔К:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -183,7 +184,7 @@ msgstr ""
 "\n"
 "╔А║╪╔И: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -191,7 +192,7 @@ msgstr ""
 "\n"
 "╔©╔╓╔Ю╔╬║╪╔С: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -199,7 +200,7 @@ msgstr ""
 "\n"
 "╥п╟ч: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -207,7 +208,7 @@ msgstr ""
 "\n"
 "╩е╩Ж╓н©╕лЁ: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -215,7 +216,7 @@ msgstr ""
 "\n"
 "ах©╔: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -223,7 +224,7 @@ msgstr ""
 "\n"
 "  ╪рл╬:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -231,7 +232,7 @@ msgstr ""
 "\n"
 "  иТ╫П:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -239,7 +240,7 @@ msgstr ""
 "\n"
 "  иТ╫П2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -247,7 +248,7 @@ msgstr ""
 "\n"
 "  иТ╫П3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -255,7 +256,7 @@ msgstr ""
 "\n"
 "  иТ╫П4: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -263,7 +264,7 @@ msgstr ""
 "\n"
 "╤хлЁй╛лН: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -281,7 +282,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -289,7 +290,7 @@ msgstr ""
 "\n"
 "г╓╟у╓нй╦╩ЗнС: "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -310,8 +311,8 @@ msgstr "%s ╓н VCard"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -326,20 +327,20 @@ msgstr "╔╚║╪╔╫╔К╓офи╓ъ╧Ч╓ч╓Л╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©\n"
 msgid "EBook not loaded\n"
 msgstr "EBook ╓о╔М║╪╔и╓╣╓Л╓ф╓╓╓ч╓╩╓С\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 "╔я╔╓╔М╔ц╔х╓н╔╒╔и╔Л╔╧╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╔ж╔М╔ц╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
@@ -388,195 +389,206 @@ msgstr "Evolution ╔╒╔и╔Л╔╧д╒╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "╔Ё╔С╔©╔╞╔х(_C)"
 
-#: 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-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"╔у╔ё╔К╔©╬ПйС╓н╔М║╪╔ицФ╓к╔╗╔И║╪:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "л╓цн╓нг╖╬з╪Ойл"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х:"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "╔ы║╪╔╧╔╗╔С╔х╔Й"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х:"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "╔╣╔ж╔╗╔С╔х╔Й"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х:"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "╓╧╓ы╓ф╓н╔╗╔С╔х╔Й"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х:"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "л╓цн╓н╔╧╔Ё║╪╔в╪Ойл"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "╔╒╔и╔Л╔╧д╒╓Рйт╫╦"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "╔п╔╓╔С╔иDN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME ╔п╔╓╔С╔и DN ╓н╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+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.glade.h:3
+msgid "Add Addressbook"
+msgstr "╔╒╔и╔Л╔╧д╒╓кди╡ц"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "╔ш╔╧╔х:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "╔╒╔и╔Л╔╧д╒╓н╔╫║╪╔╧"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME ╔ш╔╧╔х╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "╬э╨ы..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "╔К║╪╔х DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "╔ы║╪╔╧╔╗╔С╔х╔Й"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME ╔К║╪╔х DN ╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "╢Пкэ"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "╔щ║╪╔х:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "╨О╫Э"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME ╔щ║╪╔х╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "╔╣╔ж╔╗╔С╔х╔Й"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 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.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "╦║╨Вхо╟о:"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME ╔я╔╧╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "л╬а╟╓Ра╙бР"
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "б╦╨ъ╓╥╓й╓╓╬Л╧Г╔я╔╧╓Р╨Ню╝╓╧╓К"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "фЭ"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "╔╒╔и╔Л╔╧д╒╓Рйт╫╦"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "╔╒╔и╔Л╔╧д╒╓кди╡ц"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"╓╒╓й╓©╓н╩Щ╓д╔╒╔и╔Л╔╧д╒╓Ра╙бР╓╥, ╓╫╓Л╓к╓д╓╓╓ф╓н╢ьо╒╓╥╓©╬ПйС╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
-msgstr "FIXME юБлю╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "╔╒╔и╔Л╔╧д╒╓н╔╫║╪╔╧"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "╔╒╔╚╔╕╔С╔х╢имЩ"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "йт╫╦(_E)"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "╔╣║╪╔п╓ог╖╬з╓╛и╛мв"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "╔щ║╪╔х:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "╔╣║╪╔п╔А╔ц╔╩║╪╔╦:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "╓╫╓нб╬╓н╔Ё╔С╔©╔╞╔х"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s ╓н╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
+#: addressbook/gui/component/addressbook.c:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "%s ╓н╓©╓А╓н╓╒╓й╓©╓н╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "г╖╬з"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "╔А║╪╔К╔╒╔и╔Л╔╧:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "╔я╔╧╔О║╪╔и"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "╔╒╔и╔Л╔╧д╒╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -586,7 +598,7 @@ msgstr ""
 "╓РфЧно╓╥╓©╓╚, ╓╒╓К╓╓╓о LDAP ╔╣║╪╔п╓╛мН╓а╓ф╓╓╓К╓╚╓н╓и╓а╓И╓╚\n"
 "╓Р╟улё╓╥╓ч╓╧"
 
-#: addressbook/gui/component/addressbook.c:385
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -598,7 +610,7 @@ msgstr ""
 "╓╚╓И OpenLDAP ╓Р╪Хфю╓╥╓©╦Е CVS ╔╫║╪╔╧╓╚╓И╔в╔М╔╟╔И╔Ю╓Р\n"
 "╔Ё╔С╔я╔╓╔К╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С\n"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -606,42 +618,67 @@ msgstr ""
 "╓Ё╓н╔╒╔и╔Л╔╧д╒╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©. ╔я╔╧╓╛б╦╨ъ╓╥, ╔╒╔╞╔╩╔╧╦╒\n"
 "╓Р╩Щ╓ц╓ф╓╓╓К╓╚╓и╓╕╓╚╔а╔╖╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: addressbook/gui/component/addressbook.c:554
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "╔у╔ё║╪╔К╔и╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "╔А║╪╔К╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+msgid "Category is"
+msgstr "╔╚╔ф╔╢╔Й"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "╬э╨ы..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "╔╚╔ф╔╢╔Й:"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "╔у╔╘╔К╔ю╔ж╔И╔╕╔╤╓╛и╫╪╗╓╧╓К URI"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(л╬а╟╓й╓╥)"
+
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "╔А║╪╔К3"
 
@@ -665,19 +702,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "╔╒╔и╔Л╔╧д╒╓Рйт╫╦"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "╔Ё╔С╔©╔╞╔х╬ПйС╓нйт╫╦"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "╔Ё╔С╔©╔╞╔х╓ьди╡ц"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "╔А║╪╔К╔╒╔и╔Л╔╧:"
@@ -699,13 +736,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "╨О╫Э"
 
@@ -717,37 +751,56 @@ msgstr "╓╧╓ы╓ф╨О╫Э"
 msgid "Send HTML Mail?"
 msgstr "HTML ╔А║╪╔К╓РаВ©╝╓╥╓ч╓╧╓╚?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "йя╧╧╦Е╓н╔Ё╔С╔©╔╞╔х:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "л╬а╟╓Ра╙бР"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "╔Ё╔С╔©╔╞╔х(_C)"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "╪║╓╚╓Ил╬а╟╓Ра╙бР:"
+msgid "F_ind"
+msgstr "╦║╨В"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "л╬а╟╓Ра╙бР"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, 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/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "╔у╔╘╔К╔ю(_F)"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -762,8 +815,8 @@ msgid "Business _Fax"
 msgstr "╩е╩Ж╓н FAX(_F)"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "╔╚╔ф╔╢╔Й(_t)..."
 
@@ -772,16 +825,16 @@ msgid "Contact Editor"
 msgstr "╔Ё╔С╔©╔╞╔х╔╗╔г╔ё╔©"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "╬э╨ы"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "йлл╬:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "╟Лхл"
 
@@ -806,239 +859,1239 @@ msgstr "ееоц╪Ойл"
 msgid "Wants to receive _HTML mail"
 msgstr "HTML ╔А║╪╔К╓Р╪У©╝╣Ж╡д(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "╔╕╔╖╔ж╔з║╪╔╦╓н URL:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "╫╩╫Й(_A)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "╔╒╔╥╔╧╔©╔С╔х╓нл╬а╟(_A):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "цбю╦фЭ(_B):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "╩е╩Ж(_B)"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "╔Ё╔С╔©╔╞╔х(_C)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "╨О╫Э(_D)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "ц╢еЖиТ╫П(_D):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "╔у╔К╔м║╪╔Ю(_F)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "╡х(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "©╕╪О(_J):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "╔ч╔м║╪╔╦╔Ц╓нл╬а╟(_M):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "╔Б╔п╔╓╔К(_M)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "╔к╔ц╔╞╔м║╪╔Ю(_N):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "╩ЖлЁ╫Й(_O):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "юЛлГ©╕(_P):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "гш╤Ж╪т(_S):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "╓Ё╓Л╓ом╧йьй╙╓н╫╩╫Й╓г╓╧"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "╔╕╔╖╔ж╔з║╪╔╦╓н URL:"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "╓Ё╓н╔Ё╔С╔©╔╞╔х╓о╓Ё╓Л╓И╓н╔╚╔ф╔╢╔Й╓к╫Йб╟╓╥╓ф╓╓╓ч╓╧:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "╔╒╔╥╔╧╔©╔С╔х"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "╩е╩Ж"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "╩е╩Ж 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "╩е╩Ж╓н FAX"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "╦ф╓слА╓╥"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "╪ж"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "╡Я╪р"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "╡х"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "╡х 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "╡х╓н FAX"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "╔Б╔п╔╓╔К"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "╓╫╓нб╬"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "╓╫╓нб╬╓н FAX"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "╔щ╔╠╔ы╔К"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "╔в╔И╔╓╔ч╔Й"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "╔И╔╦╔╙"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "╔ф╔Л╔ц╔╞╔╧"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "╔у╔╘╔К╔ю╓╚╓И╔╣╔ч╔Й║╪╔у╔║╔╓╔К `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "╔Ё╔С╔©╔╞╔х╓н╢й╟вди╡ц"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "╓╧╓ы╓фйт╫╦"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "╔у╔К╔м║╪╔Ю"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "╔А║╪╔К"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "╫╩╫Й 2(_2):"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "╔╒╔╥╔╧╔©╔С╔х"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "╪╚ф╞"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "йЩ╦Ч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "8 ╥Н"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "г╞"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "╔╣╔╓╔╨:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "аВ©╝цФ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "╔А║╪╔К"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "╔╚╔й╔ю"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "╣дд╧"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "╫╩╫Й╔а╔╖╔ц╔╞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "╔у╔║╔╓╔К"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "╣дд╧"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "╔╚╔И║╪"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "╔Ё╔т║╪цФ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "╧Я(_y):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "╔у╔ё╔С╔И╔С╔и"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "╔╒╔А╔Й╔╚"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "╔╜╔Ц╔С╔╩╔К"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "╫╣"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "╔у╔ё╔С╔И╔С╔и"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "╔╚╔й╔ю"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "╦Аа╟"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "╟Лхл"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "╔А║╪╔К"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "╩Ч"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "фЭмкфЭ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "╨г╓БдЦ╓╓"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "╨г╓БдЦ╓╓"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "4 ╥Н"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "3 ╥Н"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "╔А║╪╔К"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "╔А║╪╔К"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "╔А║╪╔К"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "╔ч║╪╔╦╔С"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "5 ╥Н"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "╥НмкфЭ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "╔Б╔п╔╓╔К"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "╔ч╔м║╪╔╦╔Ц"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "йж©╝"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "╔╧╔Л╔ц╔и╓Ра╙бР(_T)"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "╧Б╓╓"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "4 ╥Н"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "й╛"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "╨ё"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "е╫╓Йиу╓╠"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "╔╚╔й╔ю"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "мя╩Ф"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "╔у╔ё╔С╔И╔С╔и"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "╫дд╧"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "╦Е╓к"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "╔╩╔╞╔╥╔Г╔С:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "╔╚╔й╔ю"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "╣╜о©"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "╟Лхл"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr ""
+"╔╧╔╠╔╦╔Е║╪╔К\n"
+"╩Ч╢ж"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "иАдл"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "аВ©╝"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "фЭ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "╔к╔ц╔╞╔м║╪╔Ю"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "╔у╔ё╔С╔И╔С╔и"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "╢Шфи"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "╔И╔╦╔╙"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "╔©╔╧╔╞"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "╔у╔ё╔С╔И╔С╔и"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "╟╦юХ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "╨ёфЭ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "╡п"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "╓╢╓ъх╒"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "╔╚╔й╔ю"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "(╔©╔╓╔х╔К╓й╓╥╔А╔ц╔╩║╪╔╦)"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "л╬а╟╓Ра╙бР"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "╢Шфи"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "╫╩╫Й(_A):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "╩т(_C):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "╩Д╫Ях╒(_P):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "м╧йьхж╧Ф(_Z):"
 
@@ -1129,6 +2182,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "╨О╫Э"
@@ -1139,7 +2193,7 @@ msgid "contact-list-editor"
 msgstr "╔Ё╔С╔©╔╞╔х╔╗╔г╔ё╔©"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "╔Ё╔С╔©╔╞╔х╔╗╔г╔ё╔©"
@@ -1149,7 +2203,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr "╫ейё╓╥╓©╔Ё╔С╔©╔╞╔х╓Р╦║╫п╓╥╓ч╓╥╓©"
 
@@ -1170,14 +2224,19 @@ msgstr ""
 "╓╧╓г╓кб╦╨ъ╓╥╓ф╓╓╓ч╓╧║╔ди╡ц╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+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:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "╬вфм╓╥╓ф╓╓╓К╔Ё╔С╔©╔╞╔х:"
 
-#: 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:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1185,13 +2244,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:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "╬Е╣И╦║╨В"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "╦║╨В"
 
@@ -1303,42 +2362,52 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 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:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Ё╚╓╞"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "е╨иу╓╥╓фе╬аВ(_A)"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "╟У╨Ч"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "и╫╩Ф╓Р╟У╨Ч"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "╨О╫Э"
 
@@ -1354,7 +2423,8 @@ msgid "Success"
 msgstr "╔╫║╪╔╧"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "л╓цн╓н╔╗╔И║╪"
 
@@ -1363,7 +2433,7 @@ msgstr "л╓цн╓н╔╗╔И║╪"
 msgid "Repository offline"
 msgstr "╔╙╔у╔И╔╓╔С╨Н╤х"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "╣Ж╡д╓╛╓╒╓Й╓ч╓╩╓С"
 
@@ -1382,8 +2452,11 @@ msgid "Protocol not supported"
 msgstr "аЮ╨Н╓о╔╣╔щ║╪╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1412,131 +2485,131 @@ msgid "Error removing list"
 msgstr "╔╚║╪╔и╓н╨О╫ЭцФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr "╔╚║╪╔и╓н╨О╫ЭцФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* ╔Ё╔С╔©╔╞╔х╓Рди╡ц╓╧╓К╓©╓А╓к╓Ё╓Ё╓Р╔╞╔Й╔ц╔╞ *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "йлл╬"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "╔А║╪╔К"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "╪Г╓йееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "йД╫У╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "╩е╩Ж╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "╦ф╓слА╓╥╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "╡Я╪р╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "╡х╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "ах©╔"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "╩е╩Ж╓н╫╩╫Й"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "╡х╓н╫╩╫Й"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "╥хбсееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "╪ж╨эееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "╩е╩Ж╓нееоц 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "╡х╓нееоц 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "╓╫╓нб╬╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "╓╫╓нб╬╓н╫╩╫Й"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "╔╕╔╖╔ж╔╣╔╓╔х"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "ц╢еЖиТ╫П"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "╩ЖлЁ╫Й"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "╥и╬н(а╟╓д╓╠)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "юЛлГ©╕"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "╔ч╔м║╪╔╦╔Ц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "╔к╔ц╔╞╔м║╪╔Ю"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "гш╤Ж╪т"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "╔н║╪╔х"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "╢╟н╩"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr "╔╚║╪╔и╓Р╨О╫ЭцФ..."
 
@@ -1732,6 +2805,23 @@ msgstr "иЩ:"
 msgid "_Font..."
 msgstr "╔у╔╘╔С╔х..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "╔╚╔Л╔С╔ю╓н╟У╨Ч"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "╔╚╔Л╔С╔ю╓н╟У╨Ч"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "и╫╩Ф╓Р╟У╨Ч"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1890,7 +2980,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "GNOME ╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Bonobo ╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
@@ -1899,150 +2989,141 @@ msgstr "Bonobo ╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 msgid "Could not create the alarm notify service factory"
 msgstr "╔╒╔И║╪╔Юдлцн╔╣║╪╔с╔╧╔у╔║╔╞╔х╔Й╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%b/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%Y/%B/%e %A"
 
-#: calendar/gui/calendar-commands.c:586
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%B %d"
+
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "╔╚╔Л╔С╔ю╔с╔Е║╪╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©. ORBit╓хOAF╓нюъдЙ╓Р╔а╔╖╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "╟Лхл"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "╤кхК"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "╟Лхл"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "кл"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "фН"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "еЛ"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "ю╬"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "╧Б╓╓"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "иАдл"
 
-#: 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "дЦ╓╓"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "╫╣"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "╔с╔╦║╪"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Ё╚╩о╓╥╓ф╓╓╓й╓╓"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "╢╟н╩╓╥╓ч╓╥╓©"
 
-#: 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2053,28 +3134,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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 "╔н║╪╔х"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2084,43 +3144,50 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "╔я║╪╔╩╔С╔хцм╓о 0 ╓х 100 ╓н╢ж╓г╢ч╓С╓г╓╓╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "м╔юХеы╓Р '╧Б╓╓', 'иАдл', 'дЦ╓╓' ╓╒╓К╓╓╓о 'л╓дЙ╣а' ╓Ра╙бР╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "л╓дЙ╣а"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "ф╘люеы╓о 'ф╘лю', 'итф╘лю', ╓╒╓К╓╓╓о '╓й╓╥' ╓г╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "╔н║╪╔х"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "╨фх╞"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "╓о╓╓"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "╓╓╓╓╓╗"
 
@@ -2144,30 +3211,87 @@ msgstr "и╫╪╗╓РдЙ╣а"
 msgid "Month View"
 msgstr "╥Н"
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "╔╣╔ч╔Й╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "юБлю:"
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "╔Ё╔А╔С╔х╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "╔╚╔Л╔С╔ю"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "╔©╔╧╔╞"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╡╬аш╔у╔╘╔К╔ю"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "©╥╣╛лСб╚╓Р╨Ню╝╓╥╓ч╓╧"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "©╥╣╛лСб╚"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "©╥╣╛╔©╔╧╔╞╓Р╨Ню╝╓╥╓ч╓╧"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "©╥╣╛╔©╔╧╔╞"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "╔╚╔Л╔С╔ю╓╛и╫╪╗╓╧╓К URI"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "╔╙║╪╔г╔ё╔╙╔╒╔И║╪╔Ю"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "и╫╪╗╔╙╔в╔╥╔Г╔С"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2219,114 +3343,120 @@ msgstr "╩Ч"
 msgid "minutes"
 msgstr "й╛"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr "%d фЭ"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 фЭ"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d ╫╣╢ж"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 ╫╣╢ж"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d ╩Ч╢ж"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 ╩Ч╢ж"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d й╛"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 й╛"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d иц"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 иц"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "╪║╓н╩Ч╓к╔в╔М╔╟╔И╔Ю╓Р╪б╧т╓╧╓К:"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "л╓цн"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "╨г╫И╓нлСб╚╓на╟"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "╨г╫И╓нлСб╚╓н╦Е"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "╨г╦Е╓нлСб╚╓на╟"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "╔╣╔ч╔Й:"
 
@@ -2335,12 +3465,11 @@ msgstr "╔╣╔ч╔Й:"
 msgid "_Options..."
 msgstr "╔╙╔в╔╥╔Г╔С(_O)"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "╦Е╓к"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "а╟╓к"
 
@@ -2357,7 +3486,7 @@ msgstr "лСб╚╓н╨г╦Е╓╛╥п╡А"
 msgid "hour(s)"
 msgstr "╩Ч"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "й╛"
 
@@ -2374,204 +3503,230 @@ msgid "10 minutes"
 msgstr "10 й╛"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 ╩Ч╢ж (╦Аа╟/╦А╦Е)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 й╛"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 ╩Ч╢ж"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 й╛"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 й╛"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "╔А║╪╔КюъдЙ(_M)..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "╔╒╔И║╪╔Ю╔╕╔ё╔С╔и╔╕╓╛╦╫╓Л╓©╩Ч BEEP ╡╩╓Рлд╓И╓╧"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-msgid "Calendar"
-msgstr "╔╚╔Л╔С╔ю"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "©╥╣╛лСб╚╓Р╨Ню╝╓╥╓ч╓╧"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "╔╚╔Л╔С╔ю╓нюъдЙ"
+#, fuzzy
+msgid "Days"
+msgstr "фЭ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "╫╣╓н╩о╓А:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "╤БмкфЭ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+#, fuzzy
+msgid "Hours"
+msgstr "╩Ч"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
-msgid "Compress weekends in month view"
-msgstr "╫╣кЖ╓Ри╫╪╗╓╥╓й╓╓"
+msgid "Minutes"
+msgstr "й╛"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "фЭиуаЮ╨Н╔╙╔в╔╥╔Г╔С"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "╥НмкфЭ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "╔г╔у╔╘╔К╔х"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "╢Э╦б╓Р╡А╓╝╓©╔╒╔╓╔ф╔Ю"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "и╫╪╗"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "езмкфЭ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "╟ЛфЭ╓н╫╙╓О╓Й:"
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "лСб╚╓н╫╙н╩╩Ч╢ж╓Ри╫╪╗"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "╫╣╓н╩о╓А:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "╫╣хж╧Ф╓Ри╫╪╗"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "╤Б"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "╟ЛфЭ╓н╩о╓ч╓Й:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "╤БмкфЭ"
+#, fuzzy
+msgid "Su_n"
+msgstr "фЭ"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "фЭмкфЭ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "╥Н"
+#, fuzzy
+msgid "T_hu"
+msgstr "лз"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "╥НмкфЭ"
+#, fuzzy
+msgid "T_ue"
+msgstr "╡п"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "╨ёфЭ╓╛╢Э╦б╓н╔╒╔╓╔ф╔Ю"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "╢Э╦б╓Р╡А╓╝╓©╔╒╔╓╔ф╔Ю"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "лзмкфЭ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "╓╧╓ы╓ф╓нлСб╚╓Р╨еб╔╓╧╓К"
+#, fuzzy
+msgid "Time"
+msgstr "╥и╬н(а╟╓д╓╠)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"╔©╔╓╔Ю╔╬║╪╔С: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "ез"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "╩Чй╛ЁД:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "езмкфЭ"
+msgid "Time format:"
+msgstr "╩Ч╢ж╓н╫Я╪╟:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#, fuzzy
-msgid "Show appointment end times in week and month views"
-msgstr "лСб╚╓н╫╙н╩╩Ч╢ж╓Ри╫╪╗"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "╡пмкфЭ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "╫╣хж╧Ф╓Ри╫╪╗"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "©ЕмкфЭ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "╟ЛфЭ╓н╩о╓ч╓Й:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "╫╣╢жо╚ф╞╩Ч╢ж(_o)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "фЭ"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 ╩Ч╢ж (╦Аа╟/╦А╦Е)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "фЭмкфЭ"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 ╩Ч╢ж"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "╔©╔╧╔╞"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "╨ёфЭ╓╛╢Э╦б╓н╔╒╔╓╔ф╔Ю"
+msgid "_Compress weekends in month view"
+msgstr "╫╣кЖ╓Ри╫╪╗╓╥╓й╓╓"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "лз"
+#, fuzzy
+msgid "_Display"
+msgstr "и╫╪╗"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "лзмкфЭ"
+#, fuzzy
+msgid "_End of day:"
+msgstr "╟ЛфЭ╓н╫╙╓О╓Й:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "╥и╬н(а╟╓д╓╠)"
+msgid "_Fri"
+msgstr "╤Б"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "╩Чй╛ЁД:"
+#, fuzzy
+msgid "_General"
+msgstr "╟Лхл"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "╩Ч╢ж╓н╫Я╪╟:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "╨О╫Э╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_D)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"╔©╔╓╔Ю╔╬║╪╔С: "
+msgid "_Mon"
+msgstr "╥Н"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "╡п"
+#, fuzzy
+msgid "_Other"
+msgstr "╓╫╓нб╬"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "╡пмкфЭ"
+#, fuzzy
+msgid "_Sat"
+msgstr "ез"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "©Е"
+#, fuzzy
+msgid "_Task List"
+msgstr "╔©╔╧╔╞"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "©ЕмкфЭ"
+#, fuzzy
+msgid "_Wed"
+msgstr "©Е"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
-msgid "Work Week"
-msgstr "╫╣╢жо╚ф╞╩Ч╢ж(_o)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "й╛а╟"
+msgid "before the start of the appointment"
+msgstr "╨г╫И╓нлСб╚╓на╟"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2636,66 +3791,61 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "╢ЭфЭ"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "лСб╚╓нйт╫╦"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "лСб╚"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "╔©╔╧╔╞"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "╩елУ╣╜фЧ(_J) (FIXME)"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 #, fuzzy
 msgid "No summary"
 msgstr "╔╣╔ч╔Й║╪"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "╔у╔║╔╓╔К╓Р╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2703,12 +3853,12 @@ msgstr ""
 "╓╫╓нл╬а╟╓н╔у╔║╔╓╔К╓о╓╧╓г╓кб╦╨ъ╓╥╓ч╓╧\n"
 "╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "йлл╬╓гйщб╦..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2754,44 +3904,35 @@ msgstr "кэеЖ╓к %d ╦д╓н╔©╔╧╔╞╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "кэеЖ╓к %d ╦д╓н╩елУ╣╜фЧ╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "╔у╔║╔╓╔К╓Ра╙бР"
+msgid "Addressbook..."
+msgstr "╔╒╔и╔Л╔╧д╒"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "╔╩╔╞╔╥╔Г╔С:"
+msgid "Delegate To:"
+msgstr "╨О╫Э"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-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 ""
+msgid "Enter Delegate"
+msgstr "╨О╫Э"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "лСб╚"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "╨еб╔╬У"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "╨фх╞"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
@@ -2800,174 +3941,190 @@ msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
 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/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "╔с╔╦║╪"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "й╛нЮ"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "╤кхК"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "фЭиу╓х╩Ч╢ж"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "╫╣"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "╩Де╙(_v)"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "╦Ье╙(_b)"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "и╫╪╗"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "╔╣╔ч╔Й║╪(_m):"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "╣║л╘(_C)"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "╫╙н╩╩Ч╢ж(_E):"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "Ё╚╩о╩Ч╢ж(_S):"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "╩╡╡ц╪т╓╛и╛мв"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "г╓╟у╩╡╡ц╪т"
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "ит╩╡╡ц╪т"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "╩цдЙ"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "╨О╫Э"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "╫ХмЩцФ"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "╩╡╡ц╪т╓╛и╛мв"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "г╓╟у╩╡╡ц╪т"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "ит╩╡╡ц╪т"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "аВ©╝╨я"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "╨О╫Э..."
@@ -3010,19 +4167,18 @@ msgid "Role"
 msgstr "лРЁД"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "╪Ойл"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "╪Г╨е╪т:"
@@ -3067,13 +4223,14 @@ msgstr ""
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr "╫пмХ╩Ж"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
-msgstr "╨фх╞╓н╔╚╔╧╔©╔ч╔╓╔╨"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "A_dd"
+msgstr "ди╡ц"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3084,26 +4241,33 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "╨фх╞╔К║╪╔К"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "╔╥╔С╔в╔К╓й╨фх╞"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "╨фх╞╓н╔╚╔╧╔©╔ч╔╓╔╨"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "╫╓ю╣"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "╨фх╞╓й╓╥"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "╔╥╔С╔в╔К╓й╨фх╞"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -3149,166 +4313,162 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% ╢╟н╩(_l):"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "╨О╫Э"
+msgid "Date Completed:"
+msgstr "╢╟н╩фЭ:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "╔н║╪╔х"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "╫ХмЩцФ"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "╔©╔╧╔╞"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "м╔юХеы(_P):"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% ╢╟н╩(_l):"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "╔╧╔ф║╪╔©╔╧(_S):"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "╫ХмЩцФ"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "ЁДеЖ╓ф╨я╓ъ"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "юБлю:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Ё╚╩офЭ(_r):"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "╣║л╘(_C)"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "╢ЭфЭ(_D):"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "м╔юХеы(_P):"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "╔╧╔ф║╪╔©╔╧(_S):"
-
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "Ё╚╓╞(_O)"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "╔Ё╔т║╪(_C)"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "е╫╓Йиу╓╠(_P)"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "╢╟н╩╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "╓Ё╓н╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "╢╟н╩╓╥╓©╔©╔╧╔╞╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "а╙бР╓╥╓©╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 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 "╔╒╔И║╪╔Ю"
@@ -3342,23 +4502,23 @@ msgstr "╟чеы╥пеы"
 msgid "Priority"
 msgstr "м╔юХеы"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Ё╚╩офЭ"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "╔╣╔ч╔Й║╪"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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"
@@ -3370,155 +4530,262 @@ msgstr "%02i й╛й╛ЁД"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b/%d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "©╥╣╛кХфЭ╓н╔╓╔ы╔С╔х"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "╨ёфЭ╓ь╟эф╟(_T)"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "╩ьдЙфЭ╓ь╟эф╟..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "╓Ё╓нлСб╚╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "╓Ё╓н╫пмХ╩Ж╓Р╡дф╟╓к╓╧╓К"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "╓Ё╓н╫пмХ╩Ж╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, 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."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "╓Ё╓Л╓ом╧йьй╙╓н╫╩╫Й╓г╓╧"
+msgid "Meeting Information"
+msgstr "иу╡ц╬ПйС"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 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:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "╡Я╣д╫╙н╩╩Ч╢ж(_e):"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:633
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓о╦╫╨ъмЬмя╫пмХ╓ч╓╩╓С"
+msgid "Meeting Update Request"
+msgstr "бг╧Г╓╩мв╣А(_q) (FIXME)"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "╓Ё╓Л╓ом╧йьй╙╓н╫╩╫Й╓г╓╧"
+
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "╔у╔║╔╓╔К╓Ра╙бР"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╦║╨В"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "╬ПйС"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "╔©╔╧╔╞╔я╔ц╔и"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "╓╛╪║╓н╓Б╓н╓Х╓Й╦Е"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "╔©╔╧╔╞мв╣А(_R) (FIXME)"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "йж©╝"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "╔у╔╘╔К╔ю╓г╡СиЭитг╫╓й╔╗╔И║╪╓╛х╞ю╦╓╥╓©╓Х╓╕╓г╓╧"
+msgid "Task Cancellation"
+msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "╔╚╔Л╔С╔ю╔А╔ц╔╩║╪╔╦"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "и╛©э╬ПйС"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "и╛©э╬ПйС"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "а╟╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓Р╧╧©╥╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "╢╟н╩фЭ:"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% ╢╟н╩(_l):"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "аВ©╝фЭ"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3556,44 +4823,27 @@ msgstr "╫╙н╩фЭ"
 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
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' ╓н╔©╔╧╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓Рмв╣А╓╣╓Л╓К╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#. 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 "%B %d"
-
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "©╥╣╛лСб╚..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' ╓н╔у╔╘╔К╔ю╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' ╓РЁ╚╓╞╓Ё╓х╓Рмв╣А╓╣╓Л╓К╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
@@ -3619,43 +4869,43 @@ 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 "1 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "7 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "6 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "3 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "5 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "11 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "10 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "9 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "╨ёфЭ╓ь╟эф╟"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3811,12 +5061,6 @@ msgstr "╤Б"
 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:1815
 #, fuzzy
@@ -3853,9 +5097,8 @@ msgid "Print Calendar"
 msgstr "╔╚╔Л╔С╔ю╓н╟У╨Ч"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪"
 
@@ -3868,7 +5111,7 @@ msgstr "╓Ё╓н╔╒╔╓╔ф╔Ю╓Р╟У╨Ч"
 msgid "Print Setup"
 msgstr "╔в╔Й╔С╔©╓нюъдЙ"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "╔©╔╧╔╞╔у╔╘╔К╔ю╓╛и╫╪╗╓╧╓К URI"
 
@@ -3877,8 +5120,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 ""
@@ -3887,10 +5130,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
@@ -3898,8 +5141,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
@@ -3907,13 +5150,110 @@ 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+#, fuzzy
+msgid "contains? expects 2 arguments"
+msgstr "╔я╔И╔А║╪╔©╓╒╓К╓╓╓о╟З©Т╓к╧╫й╦╡Рюо╔╗╔И║╪"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 "╔╣╔╓╔С╓о╓Ё╓н╟е╧Ф╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
@@ -3971,6 +5311,7 @@ msgid "Unable to process spool folder"
 msgstr "╔╧╔в║╪╔К╔у╔╘╔К╔ю╓Р╫ХмЩ╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "╔А╔ц╔╩║╪╔╦ %d ╓Р╪ХфюцФ (%d%%)"
 
@@ -4007,7 +5348,7 @@ msgstr "╔у╔ё╔К╔©╓н╧╫й╦╡РюоцФ╓к╔╗╔И║╪: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "╔у╔ё╔К╔©╪б╧тцФ╓к╔╗╔И║╪: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "╔у╔ё╔К╔©╦║╨В╪б╧тцФ╓к╔╗╔И║╪: %s: %s"
@@ -4034,12 +5375,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "л╓цн╓н╔ь╔ц╔ю╓г╔╞╔╗╔Й╓Р╪б╧т╓╥╓ф╓╓╓ч╓╧: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "л╣╦З╓й╪Ойл╓╛кэй╦╓к╢ч╓ч╓Л╓ф╓╓╓ч╓╧, й╦╩З╓Р╢Эбт╓╥╓ф╓╓╓ч╓╧"
 
@@ -4154,13 +5495,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ╓ь╓н╔я╔╓╔в╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
@@ -4178,15 +5519,15 @@ msgstr "╔ы╔Й╔у╔║╔╓╓╧╓К╓©╓А╓н╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╓╛╓╒╓Й╓ч╓╩╓С"
 msgid "Couldn't create temp file: %s"
 msgstr "╨Н╤х╔у╔║╔╓╔К╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "иД╧Ф╡╫╓╧╓К╓©╓А╓н╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "╪У©╝╪т╓╛╩ьдЙ╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr "иЭ╧Ф╡╫╓╧╓К╓©╓А╓н╟е╧Ф╔ф╔╜╔╧╔х╓╛╓╒╓Й╓ч╓╩╓С"
 
@@ -4194,8 +5535,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
@@ -4222,7 +5563,7 @@ msgid "Connection cancelled"
 msgstr "юэбЁ╓о╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (╔щ║╪╔х %d) ╓ьюэбЁ╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
@@ -4233,7 +5574,7 @@ msgstr "(л╓цн╓н╔ш╔╧╔х)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "аЮ╨Н╓о╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
 
@@ -4289,8 +5630,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"
@@ -4301,8 +5642,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"
@@ -4363,42 +5704,69 @@ msgstr "╓Ё╓н╔╙╔в╔╥╔Г╔С╓о╢йц╠╓й╔я╔╧╔О║╪╔и╓Р╩х╓ц╓ф╔╣║╪╔п╓ьюэбЁ╓╥╓ч╓╧"
 msgid "Unknown authentication state."
 msgstr "л╓цн╓нг╖╬з╬Убж╓г╓╧"
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "╔я╔╧╔О║╪╔и"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "╔╫║╪╔╧"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ю╣╣╛и╫╦╫╓нйт╫╦╓к╪╨гт: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ╓о╔Ф║╪╔╤л╬╔Ё╔С╔щ║╪╔м╔С╔х╓╛и╛мв╓г╓╧"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ╓о╔ш╔╧╔х╔Ё╔С╔щ║╪╔м╔С╔х╓╛и╛мв╓г╓╧"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ╓о╔я╔╧╔Ё╔С╔щ║╪╔м╔С╔х╓╛и╛мв╓г╓╧"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "╡Р╥ХцФ: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "л╬а╟╓н╦║╨В╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "╔ш╔╧╔х╓н╦║╨В╓к╪╨гт╓╥╓ч╓╥╓©: %s: ╔ш╔╧╔х╓о╦╚╓д╓╚╓Й╓ч╓╩╓С"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "╔ш╔╧╔х╓н╦║╨В╓к╪╨гт╓╥╓ч╓╥╓©: %s: л╓цн╓нмЩмЁ╓г╓╧"
@@ -4411,12 +5779,12 @@ msgstr "╡╬аш╔у╔╘╔К╔ю╔А║╪╔К╔в╔М╔п╔╓╔ю"
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "╔в╔М╔х╔Ё╔К `%s' ╓РмЬмя╓г╓╜╓К╔в╔М╔п╔╓╔ю╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4462,7 +5830,7 @@ msgstr "╔А╔ц╔╩║╪╔╦╓н╔г╔Ё║╪╔и╓к╪╨гт╓╥╓ч╓╥╓©"
 msgid "Failed to verify certificates."
 msgstr "г╖╬з╓н╬злю╓к╪╨гт╓╥╓ч╓╥╓©"
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4472,7 +5840,7 @@ msgstr ""
 "бп╬щ: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4525,61 +5893,61 @@ msgstr "╓╫╓н╓Х╓╕╓й╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "╓Ё╓н╔╢╔ъх╒╔у╔╘╔К╔ю╓╚╓И╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ╔╣║╪╔п╓╚╓Им╫╢Э╓╥╓й╓╓╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ╔Ё╔ч╔С╔и╓о╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "╔╣║╪╔п╔Л╔╧╔щ╔С╔╧╓о╓╒╓ц╓╠╓й╓╞╫╙╓О╓Й╓ч╓╥╓©"
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ╔╣║╪╔п╓н╠ЧеЗ╓о %s ╬ПйС╓Р╢ч╓С╓г╓╓╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ╔╣║╪╔п╓╚╓Им╫╢Э╓╥╓й╓╓ OK ╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "╔г╔ё╔Л╔╞╔х╔Й %s ╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ╓н╔╣╔ч╔Й║╪╓Р╔М║╪╔и╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
@@ -4593,7 +5961,7 @@ msgstr "FETCH ╠ЧеЗ╓к╔А╔ц╔╩║╪╔╦кэбн╓Р╦╚иу╓╠╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 msgid "Could not open cache directory: %s"
 msgstr "╔╜╔Ц╔ц╔╥╔Е╔г╔ё╔Л╔╞╔х╔Й╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "©╥цЕ╔А║╪╔К╓н╔а╔╖╔ц╔╞"
 
@@ -4601,7 +5969,7 @@ msgstr "©╥цЕ╔А║╪╔К╓н╔а╔╖╔ц╔╞"
 msgid "Check for new messages in all folders"
 msgstr "╓╧╓ы╓ф╓н╔у╔╘╔К╔ю╓н©╥цЕ╔А║╪╔К╓Р╔а╔╖╔ц╔╞╓╥╓ч╓╧"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "╔у╔╘╔К╔ю"
 
@@ -4640,7 +6008,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ╔╣║╪╔п %s ╓омв╣А╓╥╓©г╖╬з╔©╔╓╔в %s ╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "г╖╬з╔©╔╓╔в %s ╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
@@ -4651,7 +6019,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s ╓н IMAP ╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╓╓ч╓╩╓С"
 
@@ -4666,12 +6034,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "╓╫╓н╓Х╓╕╓й╔у╔╘╔К╔ю %s ╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4764,7 +6132,7 @@ msgstr "maildir ╥а╪╟╓н╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4778,7 +6146,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4851,20 +6219,20 @@ msgstr "maildir ╔г╔ё╔Л╔╞╔х╔Й╔я╔╧╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s: %s"
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ╓н╔у╔╘╔К╔ю╔М╔ц╔╞╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 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-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4876,12 +6244,12 @@ msgstr ""
 "╔А╔ц╔╩║╪╔╦ %s ╓Р╔у╔╘╔К╔ю %s ╓╚╓И╪Хфю╫пмХ╓ч╓╩╓С\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╡Р╪А╓к╪╨гт╓╥╓ч╓╥╓©: ╢ж╟Ц╓ц╓©╔А║╪╔К╔э╔ц╔╞╔╧╓г╓╧╓╚?"
@@ -4929,13 +6297,14 @@ msgstr "╔у╔╘╔К╔ю `%s' ╓о╤У╓г╓о╓╒╓Й╓ч╓╩╓С. ╨О╫Э╓╥╓ч╓╩╓С"
 #. 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"
+#, fuzzy
+msgid "Summarizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr "╔у╔╘╔К╔ю╓РЁ╚╓╠╓ч╓╩╓С╓г╓╥╓©: %s: ╔щ╔╦╔╥╔Г╔С %ld ╓╚╓И╔╣╔ч╔И╔╓╔╨цФ: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4945,24 +6314,22 @@ 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"
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
 msgstr "╔у╔╘╔К╔ю╓Р╔╣╔ч╔И╔╓╔╨╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %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:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "╔у╔╘╔К╔ю╓Р╔╣╔ч╔И╔╓╔╨╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5066,6 +6433,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "╔у╔╘╔К╔ю╓Р╔╣╔ч╔И╔╓╔╨╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5155,39 +6533,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s ╓н .newsrc ╔у╔║╔╓╔К╓Р╨Ню╝╓ч╓©╓оЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "POP ╔╣╔ч╔Й╓Р╪ХфюцФ"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP ╔╣║╪╔п╓г©╥╣╛╔А╔ц╔╩║╪╔╦╓Р╔а╔╖╔ц╔╞╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "╔у╔╘╔К╔ю╓РЁ╚╓╠╓ч╓╩╓С╓г╓╥╓©: ╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓ол╓╢╟ю╝╓г╓╧"
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "uid %s ╓н╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
-
-#: 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:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╪Х╓Й╫п╓╧╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "POP ╔╣║╪╔п %s ╓╚╓И╔А╔ц╔╩║╪╔╦╓Р╪Хфю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "uid %s ╓н╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "POP ╔А╔ц╔╩║╪╔╦ %d ╓Р╪ХфюцФ"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr ""
@@ -5201,7 +6579,7 @@ msgstr "╔╣║╪╔п╓к╔А╔ц╔╩║╪╔╦╓Р╩д╓╧"
 msgid "Delete after %s day(s)"
 msgstr "%s фЭ╦Е╓к╨О╫Э╓╧╓К"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5210,9 +6588,8 @@ 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 ""
@@ -5228,9 +6605,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 ""
@@ -5294,7 +6671,7 @@ msgid "No such folder `%s'."
 msgstr "╓╫╓н╓Х╓╕╓й╔у╔╘╔К╔ю `%s' ╓о╓╒╓Й╓ч╓╩╓С"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5308,7 +6685,8 @@ 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
@@ -5347,7 +6725,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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5355,122 +6733,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:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "╧╫й╦╡Рюо╔╗╔И║╪, ╔Ё╔ч╔С╔и╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "╔я╔И╔А║╪╔©╓╒╓К╓╓╓о╟З©Т╓к╧╫й╦╡Рюо╔╗╔И║╪"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "╔Ё╔ч╔С╔и╓о╪баУ╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "╔Ё╔ч╔С╔и╔я╔И╔А║╪╔©╓о╪баУ╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr "╔╥╔╧╔ф╔Ю╔╧╔ф║╪╔©╔╧╓╒╓К╓╓╓о╔╥╔╧╔ф╔Ю╔ь╔К╔в╠ЧеЗ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "╔ь╔К╔в╔А╔ц╔╩║╪╔╦"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "╔╣║╪╔с╔╧╓омЬмя╓г╓╜╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "╔╣║╪╔с╔╧╓оаВ©╝╔а╔Ц╔С╔м╔К╓Рйд╓╦╓ф╓╓╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "╔╣║╪╔с╔╧╓омЬмя╓г╓╜╓ч╓╩╓С, аВ©╝╔а╔Ц╔С╔м╔К╓Рйд╓╦╓ф╓╓╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "мв╣А╓╣╓Л╓©╔А║╪╔К╓нф╟╨Н╓оOK, ╢╟н╩╓╥╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr "╔Ф║╪╔╤╓о╔М║╪╔╚╔К╓г╓о╓╒╓Й╓ч╓╩╓С; <forward-path> ╓ье╬аВ╓╥╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "мв╣А╓╣╓Л╓©╔А║╪╔К╓нф╟╨Н╓о╢╟н╩╓╥╓ч╓╩╓С: ╔А║╪╔К╔э╔ц╔╞╔╧╓омЬмя╓г╓╜╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "мв╣А╓╣╓Л╓©ф╟╨Н╓о╢╟н╩╓╥╓ч╓╩╓С: ╔А║╪╔К╔э╔ц╔╞╔╧╓омЬмя╓г╓╜╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "мв╣А╓╣╓Л╓©ф╟╨Н╓РцФцг╓╥╓ч╓╥╓©: ╫ХмЩцФ╓к╔╗╔И║╪"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "╔Ф║╪╔╤╓о╔М║╪╔╚╔К╓г╓о╓╒╓Й╓ч╓╩╓С; <forward-path> ╓Р╩Н╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr "мв╣А╓╣╓Л╓©ф╟╨Н╓о╢╟н╩╓╥╓ч╓╩╓С: ╔╥╔╧╔ф╔Ю╓нйщб╦нн╟Х╓╛б╜╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "мв╣А╓╣╓Л╓©╔А║╪╔К╓нф╟╨Н╓РцФцг╓╥╓ч╓╥╓©: нн╟ХЁД╓ЙеЖ╓ф╓Р╠ш╓╗╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "мв╣А╓╣╓Л╓©ф╟╨Н╓о╢╟н╩╓╥╓ч╓╩╓С: ╔А║╪╔К╔э╔ц╔╞╔╧л╬╓ог╖╓А╓И╓Л╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "╔А║╪╔К╓нфЧно╓РЁ╚╩о╓╥╓ч╓╧; <CRLF>.<CRLF> ╓г╫╙н╩╓╥╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "╫ХмЩ╓о╪╨гт╓╥╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "╔я╔╧╔О║╪╔и╓нйя╧╧╓╛и╛мв╓г╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "г╖╬з╔А╔╚╔к╔╨╔Ю╓оит╫╫й╛╡А╓╝╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr "мв╣А╓╥╓©г╖╬з╔А╔╚╔к╔╨╔Ю╓н╓©╓А╓к╟е╧Ф╡╫╓╛и╛мв╓г╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "╟Л╩Че╙╓йг╖╬з╓к╪╨гт╓╥╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "г╖╬з╓Ри╛мв╓х╓╥╓ф╓╓╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "╫И╢Э╠ЧеЗ╔╗╔И║╪: %s: ╓©╓ж╓Сцвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP ╔╣║╪╔п %s ╓омв╣А╓╥╓©г╖╬з╔©╔╓╔в %s ╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s %s@%s ╓н SMTP ╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5481,127 +6859,128 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ╔╣║╪╔п %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s ╥пмЁ╓г SMTP ╔А║╪╔К╓Ргш©╝╓╥╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝╫пмХ╓ч╓╩╓С: аВ©╝╪т╓н╔╒╔и╔Л╔╧╓╛дЙ╣а╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝╫пмХ╓ч╓╩╓С: аВ©╝╪т╓н╔╒╔и╔Л╔╧╓╛ю╣╓╥╓╞╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝цФ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝╫пмХ╓ч╓╩╓С: ╪У©╝╪т╓╛дЙ╣а╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: цвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: цвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
-msgstr "SASL г╖╬з╔╙╔ж╔╦╔╖╔╞╔х╓ню╦ю╝цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "г╖╬з"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr "SASL г╖╬з╔╙╔ж╔╦╔╖╔╞╔х╓ню╦ю╝цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr "AUTH мв╣А╓к╪╨гт╓╥╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "╔╣║╪╔п╓╚╓И╢ж╟Ц╓ц╓©г╖╬з╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA аВ©╝╓н╔©╔╓╔Ю╔╒╔╕╔х: ╔А╔ц╔╩║╪╔╦╓н╫╙н╩: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: цвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: цвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
@@ -5631,7 +7010,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "е╨иу"
 
@@ -5664,58 +7043,58 @@ msgstr "MIME ╔©╔╓╔в:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "╔╒╔и╔Л╔╧д╒╓н╓©╓А╓к╓Ё╓Ё╓г╔╞╔Й╔ц╔╞"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "╨╧╫п©м:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "йж©╝юХ:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "╥Ол╬:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "╟╦юХ:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╔╚║╪╔э╔С╔Ё╔т║╪╓Р╪У©╝╓╧╓К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т╔Й╔╧╔х╓нцФ╓к╦╫╓Л╓й╓╓╓г, "
-"╔А╔ц╔╩║╪╔╦╓н╔╚║╪╔э╔С╔Ё╔т║╪╓Р╪У©╝╓╧╓К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ч╓╧"
+"╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т╔Й╔╧╔х╓нцФ╓к╦╫╓Л╓й╓╓╓г, ╔А╔ц╔╩║╪╔╦╓н╔╚║╪╔э╔С╔Ё╔т║╪╓Р╪У©╝╓╧"
+"╓К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ч╓╧"
 
 #: composer/e-msg-composer-select-file.c:228
 #: ui/evolution-message-composer.xml.h:2
@@ -5738,30 +7117,30 @@ msgid ""
 "%s"
 msgstr "╔у╔║╔╓╔К╓н╔М║╪╔ицФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "йлл╬╓гйщб╦..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "╥ы╧П"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "╔у╔║╔╓╔К╓н╔М║╪╔ицФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5769,17 +7148,17 @@ msgstr ""
 "╓Ё╓н╔╒╔╚╔╕╔С╔х╓наП╟ф╔у╔╘╔К╔ю╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С\n"
 "╔г╔у╔╘╔К╔х╓наП╟ф╔у╔╘╔К╔ю╓Р╩х╓ц╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "POP ╔╣║╪╔п %s ╓╚╓И╔А╔ц╔╩║╪╔╦╓Р╪Хфю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5788,7 +7167,7 @@ msgstr ""
 "╫пно╔у╔║╔╓╔К╓Р╨Ню╝╫пмХ╓ч╓╩╓С: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5797,7 +7176,7 @@ msgstr ""
 "╫пно╔у╔║╔╓╔К╓Р╨Ню╝╫пмХ╓ч╓╩╓С: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5806,16 +7185,16 @@ msgstr ""
 "╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 #, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution ╓о Pine ╔А║╪╔К╔у╔║╔╓╔К╓Рх╞╦╚╓╥╓ч╓╥╓©\n"
 "Evolution ╓ь╔╓╔С╔щ║╪╔х╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5825,25 +7204,25 @@ msgstr ""
 "\n"
 "йя╧╧╓Рйщб╦╓╥╓ч╓╧╓╚?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "╔у╔║╔╓╔К╓РЁ╚╓╞"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓начфЧ..."
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "╔А║╪╔К╨Ню╝╔╕╔ё╔С╔и╔╕╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
@@ -5871,57 +7250,103 @@ msgstr "╔╒╔и╔Л╔╧╔╚║╪╔и"
 msgid "calendar information"
 msgstr "╔╚╔Л╔С╔ю╬ПйС"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "╓╛╪║╓н╓Б╓н╓Р╢ч╓ч╓й╓╓"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "╔Ё╔А╔С╔х╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "╪У©╝╪т"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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: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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%Y/%m/%d (%a)"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5929,13 +7354,13 @@ 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:303
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M"
 
@@ -6033,7 +7458,7 @@ msgstr "╦╫╨ъ╩Ч╧О╓ь╓наЙбп╩Ч╢ж"
 msgid "Compare against"
 msgstr "╣ухФЁс"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "╨ё"
 
@@ -6045,11 +7470,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%m╥Н %dфЭ %p %l:%M"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<фЭиу╓Ра╙бР╓╧╓К╓©╓А╓к╓Ё╓Ё╓Р╔╞╔Й╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "╔у╔ё╔К╔©╔К║╪╔К"
 
@@ -6070,20 +7499,20 @@ msgstr ""
 "╔у╔╘╔К╔ю╓на╙бР╓Рк╨╓Л╓ф╓╓╓ч╓╧\n"
 "лА╓ц╓ф╔А║╪╔К╓РгшаВ╓╧╓Км╜╦З╓й╔у╔╘╔К╔ю╓Р╩ьдЙ╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "╔у╔╘╔К╔ю╓Ра╙бР"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "╔у╔╘╔К╔ю URI ╓нфЧно"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<╔у╔╘╔К╔ю╓Ра╙бР╓╧╓К╓©╓А╓к╓Ё╓Ё╓Р╔╞╔Й╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6104,62 +7533,51 @@ msgstr "╔К║╪╔Кл╬: "
 msgid "Untitled"
 msgstr "╔©╔╓╔х╔К╓й╓╥"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "╓Б╓╥"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "╪║╓н╬Р╥О╓гф╟╨Н╓Р╪б╧т:"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "╓╧╓ы╓ф╓н╢П╫Ю╓╛╧Г╓ц╓©╩Ч"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "╓╓╓╞╓д╓╚╓н╢П╫Ю╓╛╧Г╓ц╓©╩Ч"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "╢П╫Ю╓Рди╡ц"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "фЧно"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "╔у╔ё╔К╔©╓Рйт╫╦"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "╡╬аш╔у╔╘╔К╔ю╓нйт╫╦"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "фЧно"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "╫пно"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "╡╬аш╔у╔╘╔К╔ю"
 
@@ -6183,193 +7601,194 @@ msgstr "╓╧╓ы╓ф╓н╔М║╪╔╚╔К╓хм╜╦З╓й╔Й╔Б║╪╔х╔у╔╘╔К╔ю"
 msgid "with all local folders"
 msgstr "╓╧╓ы╓ф╓н╔М║╪╔╚╔К╔у╔╘╔К╔ю"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "ЁДеЖ╓ф╨я╓ъ"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "е╨иу"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "╔у╔╘╔К╔ю╓ь╔Ё╔т║╪"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "╪У©╝фЭ"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "аВ©╝фЭ"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "╨О╫Э"
 
-#: 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
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "╓╛б╦╨ъ╓╥╓й╓╓"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "аП╟ф"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "╓╛╪║╓н╓Б╓н╓г╫╙╓О╓К"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "╓╛б╦╨ъ╓╧╓К"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "╓╛б╦╨ъ╓╧╓К"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "и╫╦╫"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "╫емв"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "╓╛╪║╓н╓Б╓н╓х╟Лцв╓╧╓К"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "╓╛╪║╓н╓Б╓н╓Х╓ЙбГ╓╜╓╓"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "╓╛╪║╓н╓Б╓н╓Х╓Й╬╝╓╣╓╓"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "╓╛╪║╓н╓Б╓н╓г╓о╓й╓╓"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "╔А╔ц╔╩║╪╔╦кэбн"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "╔А╔ц╔╩║╪╔╦╔ь╔ц╔ю"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "╪У©╝╓╥╓©╔А╔ц╔╩║╪╔╦"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "аВ©╝╓╥╓©╔А╔ц╔╩║╪╔╦"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟"
 
-#: 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
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "╢Шфи"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "╪У©╝╪т"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "ю╣╣╛и╫╦╫╓х╟Лцв"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "йж©╝юХ"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "╣╜о©"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "аВ©╝╪т"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "╔╧╔ф║╪╔©╔╧юъдЙ"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "╓╛╪║╓н╓Б╓н╓н╓Х╓╕╓к╦╚╓╗╓К"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "╔╫║╪╔╧╔╒╔╚╔╕╔С╔х"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "╩ьдЙ╓н╔ь╔ц╔ю"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "╓╛╪║╓н╓Б╓н╓гЁ╚╩о╓╧╓К"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "╫ХмЩдД╩ъ"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "╥Ол╬"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "╓╛╪║╓н╓Б╓н╓Р╢ч╓ч╓й╓╓"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "╓╛╪║╓н╓Б╓н╓г╫╙╓И╓й╓╓"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "╓╛б╦╨ъ╓╥╓й╓╓"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "╓╛╪║╓н╓Б╓н╓н╓Х╓╕╓г╓й╓╓"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "╓╛╪║╓н╓Б╓н╓г╩о╓ч╓И╓й╓╓"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "╓╛╪║╓н╓Б╓н╓г╫╙╓О╓К"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "╓╛б╦╨ъ╓╧╓К"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "╓╛╪║╓н╓Б╓н╓Х╓ЙбГ╓╜╓╓"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "╓╛╪║╓н╓Б╓н╓Х╓Й╬╝╓╣╓╓"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "╓╛╪║╓н╓Б╓н╓г╓о╓й╓╓"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "╓╛╪║╓н╓Б╓н╓х╟Лцв╓╧╓К"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "╓╛╪║╓н╓Б╓н╓н╓Х╓╕╓к╦╚╓╗╓К"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "╓╛╪║╓н╓Б╓н╓гЁ╚╩о╓╧╓К"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "╓╛╪║╓н╓Б╓н╓Х╓Й╦Е"
@@ -6399,14 +7818,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "╔А║╪╔К"
 
@@ -6434,11 +7852,11 @@ msgstr ""
 "Evolution ╓о GnomeCard ╔у╔║╔╓╔К╓Рх╞╦╚╓╥╓ч╓╥╓©\n"
 "Evolution ╓ь╔╓╔С╔щ║╪╔х╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "юъдЙ"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6494,169 +7912,190 @@ msgstr "╔А║╪╔К╔╣╔ч╔Й╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
 msgid "Mail configuration interface"
 msgstr "╔А║╪╔КюъдЙ╓н╔╓╔С╔©║╪╔у╔╖║╪╔╧"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╡╬аш╔у╔╘╔К╔ю"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "╔в╔М╔я╔ф╔ё(_P)..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "╔у╔║╔╓╔К╓н╔в╔М╔я╔ф╔ё╓Р╫╓ю╣╓╥╓ч╓╧"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╔А║╪╔К(_M)"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╔А║╪╔К(_M)"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "╔╥╔╖╔К╓г╔╧╔х╔Л║╪╔╦╓Репо©╫пмХ╓ч╓╩╓С"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" ╓н╔в╔М╔я╔ф╔ё"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "╔в╔М╔я╔ф╔ё"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "╔А╔ц╔╩║╪╔╦╓╚╓И╔у╔ё╔К╔©╓Р╨Ню╝(_C)"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "╥Ол╬╓н╡╬аш╔у╔╘╔К╔ю(_S)"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "аВ©╝╪т╓н╡╬аш╔у╔╘╔К╔ю(_n)"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "╪У©╝╪т╓н╡╬аш╔у╔╘╔К╔ю(_R)"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╡╬аш╔у╔╘╔К╔ю(_L)"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "╥Ол╬╓н╔у╔ё╔К╔©(_j)"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "аВ©╝╪т╓н╔у╔ё╔К╔©(_d)"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "╪У©╝╪т╓н╔у╔ё╔К╔©(_c)"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔©(_M)"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "╨фаВ©╝"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "йлл╬╓гйщб╦(_S)..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "╟У╨Ч(_P)"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "аВ©╝╪т╓ьйж©╝(_R)"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "а╢╟В╓ьйж©╝(_A)"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "а╢╟В╓ьйж©╝(_A)"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "е╬аВ(_F)"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "╢Шфи╓х╓╥╓ф╔ч║╪╔╞(_k)"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "л╓фи╓х╓╥╓ф╔ч║╪╔╞(_n)"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "╫емв"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "л╓фи╓х╓╥╓ф╔ч║╪╔╞(_n)"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟(_M)..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╔Ё╔т║╪(_C)..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "╨О╫Э╪Х╬ц(_U)"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "╔╒╔и╔Л╔╧д╒╓кди╡ц"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "╔у╔ё╔К╔©е╛мя"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓╚╓И╔К║╪╔К╓Р╨Ню╝(_l)"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔© (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╡╬аш╔у╔╘╔К╔ю (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "иу╡ц╬ПйС"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Evolution ╓ь mbox ╓Р╔╓╔С╔щ║╪╔х╓╧╓К╔у╔║╔╞╔х╔Й"
@@ -6718,16 +8157,16 @@ msgid "Evolution News Editor"
 msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔╗╔г╔ё╔©"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔╗╔г╔ё╔©"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "╫Пл╬╔у╔║╔╓╔К:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6738,40 +8177,45 @@ msgstr ""
 "\n"
 "йя╧╧╓Рйщб╦╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (╔г╔у╔╘╔К╔х)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "л╣╦З"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "м╜╦З"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "кэеЖ╓к╓Ё╓н╔╒╔╚╔╕╔С╔х╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "╨О╫Э"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "╔г╔у╔╘╔К╔х╔╒╔╚╔╕╔С╔х╓Р╨Н╓К"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "кэеЖ╓к news ╔╒╔╚╔╕╔С╔х╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔ч╔м║╪╔╦╔Ц"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "╔А║╪╔КюъдЙ(_M)..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6825,11 +8269,11 @@ msgstr ""
 "╓╒╓й╓©╓о╔А║╪╔К╓Р╨Ню╝╓╧╓Ка╟╓к╔А║╪╔К\n"
 "гшаВ╓нюъдЙ╓Р╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧"
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "╔А║╪╔Ке╬аВ╔А╔╫╔ц╔и╓нюъдЙ╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6837,7 +8281,7 @@ msgstr ""
 "╓Ё╓н╔А╔ц╔╩║╪╔╦╓о╥Ол╬╓╛╓╒╓Й╓ч╓╩╓С\n"
 "кэеЖ╓каВ©╝╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6845,37 +8289,36 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓РаВ©╝╓╧╓Ке╛юз╓й╪У©╝╪т╓Р╩ьдЙ╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 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 "On %s, %s wrote:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟эф╟╓╥╓ч╓╧: "
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╥╓ч╓╧: "
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "кэеЖ╓к %d ╔А╔ц╔╩║╪╔╦╓Рйт╫╦╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6883,7 +8326,7 @@ msgstr ""
 "╔и╔И╔у╔х╔у╔╘╔К╔юфБ╓кйщб╦╓╣╓Л╓©\n"
 "╔А╔ц╔╩║╪╔╦╓ю╓╠╓Рйт╫╦╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╧"
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6891,24 +8334,41 @@ msgstr ""
 "аВ©╝╔у╔╘╔К╔ю╓н╔А╔ц╔╩║╪╔╦╓ю╓╠\n"
 "╨фаВ©╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╧"
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "кэеЖ╓к %d ╔А╔ц╔╩║╪╔╦╓Р╨фаВ╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "╥ы╧П"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓РфСеы╓хи╫╪╗╓╥╓й╓╓"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6917,144 +8377,161 @@ msgstr ""
 "╔у╔ё╔К╔©╬ПйС╓н╔М║╪╔ицФ╓к╔╗╔И║╪:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "╔у╔ё╔К╔©"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╟У╨Ч╓к╪╨гт╓╥╓ч╓╥╓©"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "кэеЖ╓к %d ╔А╔ц╔╩║╪╔╦╓Рйл╔╕╔ё╔С╔и╔╕╓гЁ╚╓╓╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "╟й╡╪╓к╓╒╓й╓©╓нл╬а╟╓х╔А║╪╔К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓║╔\"╔╙╔в╔╥╔Г╔С\"\n"
 "╔у╔ё║╪╔К╔и╟й╡╪╓оаВ╓К╔А║╪╔К╓к╓Ё╓н╬ПйС╓Р╢ч╓ъ╓©╓╓╓й╓╓╓й╓И╓╕╓А╓Ки╛мв╓о\n"
 "╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "╟й╡╪╓к╔А║╪╔К╔╣║╪╔п╓д╓╓╓ф╓н╬ПйС╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓║╔╓Б╓╥╓╒╓й╓©╓н╩х╓╕╔╣║╪╔п╓н\n"
 "╪ОнЮ╓╛╡©╓╚╓Рцн╓И╓й╓╓╓й╓И╓п╔╥╔╧╔ф╔Ю╢имЩ╪т╓╚╔╓╔С╔©║╪╔м╔ц╔х╔в╔М╔п╔╓╔ю╓х\n"
 "о╒мМ╓Р╓х╓ц╓ф╓ъ╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "╟й╡╪╓каВ©╝╔в╔М╔х╔Ё╔К╓к╓д╓╓╓ф╓н╬ПйС╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓║╔╓Б╓╥╓╒╓й╓©╓н╩х╓╕\n"
 "╔в╔М╔х╔Ё╔К╓Рцн╓И╓й╓╓╓й╓И╓п║╓╔╥╔╧╔ф╔Ю╢имЩ╪т╓╚╔╓╔С╔©║╪╔м╔ц╔х╔в╔М╔п╔╓╔ю╓х\n"
 "о╒мМ╓Р╓х╓ц╓ф╓ъ╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 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 ""
-"╔А║╪╔КюъдЙ╓н╫ХмЩ╓о╓ю╓╓╓©╓╓╢╟н╩╓╥╓ч╓╥╓©║╔╓╒╓й╓©╓╛дС╤║╓╥╓©©х╦╣║╓╔А║╪╔К╔╣║╪╔п╓Д"
-"\n"
-"аВ©╝╔в╔М╔х╔Ё╔К╓о Evolution "
-"╔А║╪╔К╔╒╔╚╔╕╔С╔х╓Р╨Н╓К╓©╓А╓к╟Ле╩╓А╓к╓╣╓Л╓К╓г╓╥╓Г╓╕\n"
-"╟й╡╪╓к╓Ё╓н╔╒╔╚╔╕╔С╔х╓н╤У╢ж╓нл╬а╟╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓║╔╓Ё╓нл╬а╟╓ои╫╪╗лэе╙╓ю╓╠╓к"
-"\n"
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"╔А║╪╔КюъдЙ╓н╫ХмЩ╓о╓ю╓╓╓©╓╓╢╟н╩╓╥╓ч╓╥╓©║╔╓╒╓й╓©╓╛дС╤║╓╥╓©©х╦╣║╓╔А║╪╔К╔╣║╪╔п"
+"╓Д\n"
+"аВ©╝╔в╔М╔х╔Ё╔К╓о Evolution ╔А║╪╔К╔╒╔╚╔╕╔С╔х╓Р╨Н╓К╓©╓А╓к╟Ле╩╓А╓к╓╣╓Л╓К╓г╓╥╓Г"
+"╓╕\n"
+"╟й╡╪╓к╓Ё╓н╔╒╔╚╔╕╔С╔х╓н╤У╢ж╓нл╬а╟╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓║╔╓Ё╓нл╬а╟╓ои╫╪╗лэе╙╓ю╓╠"
+"╓к\n"
 "╩хмя╓╣╓Л╓ч╓╧║╔"
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔╕╔ё╔╤║╪╔и"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "╔╣║╪╔п╓ьюэбЁцФ..."
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr "╔╣╔щ║╪╔х╓╣╓Л╓©╪Ойл╓Р╔а╔╖╔ц╔╞"
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " ╔╚╔И║╪"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "╔╣╔╓╔С╓о╓Ё╓н╟е╧Ф╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "╔╒╔╚╔╕╔С╔х"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "╔╒╔╚╔╕╔С╔х╬ПйС"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "╔╒╔╚╔╕╔С╔х╢имЩ"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "╔╒╔╚╔╕╔С╔х"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "╟е╧Ф╡╫╓╥╓©╔А║╪╔К╓РаВ©╝╓╧╓К╩Ч╓к╬О╓к╪╚й╛╪╚©х╓к╟е╧Ф╡╫╓╥╓ч╓╧"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 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:9
+msgid "Always sign outgoing messages when using this account"
+msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "е╨иу"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "г╖╬з"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "г╖╬з╪Ойл: "
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr "©╥цЕ╔А║╪╔К╓Р╪╚ф╟е╙╓к╔а╔╖╔ц╔╞╓╧╓К"
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr "г╖╬з ID"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "╔А║╪╔К╨Ню╝"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7070,279 +8547,256 @@ msgstr ""
 "\n"
 "\"╢╟н╩\" ╓Р╔╞╔Й╔ц╔╞╓╥╓фюъдЙ╓Рйщб╦╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "╔г╔у╔╘╔К╔х(_f)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Default Forward style is: "
 msgstr "╔г╔у╔╘╔К╔х╓н \"е╬аВ\" йЩк║: "
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+#, fuzzy
+msgid "Default character encoding: "
 msgstr "╔г╔у╔╘╔К╔х╓н╔╜╔Ц╔И╔╞╔©╔╩╔ц╔х: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr "╔г╔╦╔©╔К ID..."
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "и╫╪╗"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "╢╟н╩"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "аП╟ф"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "аП╟ф╔у╔╘╔К╔ю:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "йт╫╦..."
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "E_nable"
+msgstr "м╜╦З"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "╔А║╪╔К╔╒╔и╔Л╔╧:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "╦╫╨ъ╓н╔у╔║╔╓╔К╓Рйлл╬╓гйщб╦╓╥╓ч╓╧"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "йт╫╦..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "м╜╦З"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "╔у╔К╔м║╪╔Ю:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "╔г╔╦╔©╔КID ╓Р╪Хфю..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "╫Пл╬╔у╔║╔╓╔К:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr "╟Змя╓Р╤╞д╢╓╧╓К"
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "©х╦╣"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "HTML ╔А║╪╔К"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "╔╓╔С╔И╔╓╔С"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr "аВ©╝╪т╓╛╔╒╔и╔Л╔╧д╒╓к╓╓╓Л╓К╬Л╧Г╡ХаЭ╓Рфи╓ъ╧Ч╓Ю"
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "╔А║╪╔К╓нюъдЙ"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "╔А║╪╔К╔э╔ц╔╞╔╧╓н╥а╪╟"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
-msgstr "╔г╔у╔╘╔К╔х╔╒╔╚╔╕╔С╔х╓Р╨Н╓К"
-
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "╩ьдЙ╩Ч╢ж╦Е╓к╔А╔ц╔╩║╪╔╦╓Р \"╢Шфи\" ╓х╓╥╓ф╔ч║╪╔╞:"
+msgid "Make this my _default account"
+msgstr "╔г╔у╔╘╔К╔х╔╒╔╚╔╕╔С╔х╓Р╨Н╓К"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "╔к╔Е║╪╔╧"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "иу╡ц╬ПйС"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "ах©╔:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "PGP╔╜║╪ ID:"
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr "PGP ╔в╔М╔╟╔И╔Ю╓н╔я╔╧:"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "╔╚╔И║╪╓Ра╙бР"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Prompt when sending messages with an empty subject"
+msgid "Prompt when sending messages with an _empty subject"
 msgstr "╓Ё╓н╥Ол╬╓н╔А╔ц╔╩║╪╔╦╓Р╔у╔ё╔К╔©╓╧╓К╔К║╪╔К╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝╫пмХ╓ч╓╩╓С: ╪У©╝╪т╓╛дЙ╣а╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "╟Змя"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "╔А║╪╔К╓н╪У©╝цФ"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "╔А║╪╔К╓н╪У©╝"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "╪У©╝╔╙╔в╔╥╔Г╔С"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "и╛©э╬ПйС"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "╔╩╔╜╔Е╔╒ MIME"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "╔╩╔╜╔Е╔Й╔ф╔ё"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "╔у╔║╔╓╔К╓Ра╙бР"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP ╔в╔М╔╟╔И╔Ю╓Ра╙бР"
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
-msgstr "╔г╔у╔╘╔К╔х╓г HTML ╥а╪╟╓н╔А║╪╔К╓РаВ©╝╓╧╓К"
-
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "╔А║╪╔К╓РаВ©╝цФ"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "╔А║╪╔К╓наВ©╝"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "аВ©╝╨я"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "аВ©╝╨я╓хаП╟ф╔А╔ц╔╩║╪╔╦"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "аВ©╝╨я╔А╔ц╔╩║╪╔╦╔у╔╘╔К╔ю:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "╔╣║╪╔п╓нюъдЙ"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "╔╣║╪╔п╪Ойл:"
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "╔╣║╪╔п╓ог╖╬з╓╛и╛мв"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "╫Пл╬╔у╔║╔╓╔К:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "╔╫║╪╔╧"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "╬ПйС╓й╓╥"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "╔╫║╪╔╧"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "фцйл╓й╔у╔╘╔К╔ю"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "и╦╫Юе╙╓й UNIX ╓н mbox ╔у╔║╔╓╔К"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use secure connection (_SSL)"
 msgstr "╔╩╔╜╔Е╔╒юэбЁ (SSL) ╓Р╩х╓╕"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "╔Ф║╪╔╤л╬:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7350,15 +8804,122 @@ msgstr ""
 "\n"
 "\"╪║\" ╓Р╔╞╔Й╔ц╔╞╓╥╓ф╩о╓А╓ф╓╞╓ю╓╣╓╓"
 
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "_Always load images off the net"
+msgstr "╬О╓к╡ХаЭ╓Рфи╓ъ╧Ч╓ч╓й╓╓"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "©╥цЕ╔А║╪╔К╓Р╪╚ф╟е╙╓к╔а╔╖╔ц╔╞╓╧╓К"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr "╔╣╔щ║╪╔х╓╣╓Л╓©╪Ойл╓Р╔а╔╖╔ц╔╞"
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "╔А║╪╔К╔╒╔и╔Л╔╧:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "╔у╔К╔м║╪╔Ю:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "╫Пл╬╔у╔║╔╓╔К:"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "╟Змя╓Р╤╞д╢╓╧╓К"
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "╔ш╔╧╔х:"
+
+#: mail/mail-config.glade.h:102
+#, fuzzy
+msgid "_Load images if sender is in addressbook"
+msgstr "аВ©╝╪т╓╛╔╒╔и╔Л╔╧д╒╓к╓╓╓Л╓К╬Л╧Г╡ХаЭ╓Рфи╓ъ╧Ч╓Ю"
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "╩ьдЙ╩Ч╢ж╦Е╓к╔А╔ц╔╩║╪╔╦╓Р \"╢Шфи\" ╓х╓╥╓ф╔ч║╪╔╞:"
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "л╬а╟:"
+
+#: mail/mail-config.glade.h:106
+#, fuzzy
+msgid "_Never load images off the net"
+msgstr "фСеы╓х╡ХаЭ╓Рфи╓ъ╧Ч╓ч╓й╓╓"
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "ах©╔:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "PGP ╔в╔М╔╟╔И╔Ю╓н╔я╔╧:"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "╔я╔╧:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "╓Ё╓н╔я╔╧╔О║╪╔и╓Р╣╜╡╠"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "╔г╔у╔╘╔К╔х╓г HTML ╥а╪╟╓н╔А║╪╔К╓РаВ©╝╓╧╓К"
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "╫Пл╬╔у╔║╔╓╔К:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "╔Ф║╪╔╤л╬:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr " иц"
 
@@ -7398,182 +8959,193 @@ msgstr "S/MIME ╔╗╔С╔ы╔М║╪╔в╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME ╔г╔Ё║╪╔и╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "е╨иу╓нйщб╦"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "╔г╔ё╔╧╔╞╓ьйщб╦..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "╔╓╔С╔И╔╓╔Си╫╪╗"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ╓кЁ╚╓╞..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "╔╓╔С╔И╔╓╔Си╫╪╗ (%s╥пмЁ)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "╠ё╓╧"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Ё╟иТ╔с╔Е║╪╔╒"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "╔А╔ц╔╩║╪╔╦╓нфБмф╓Рфи╓ъ╧Ч╓ъцФ"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "╔ж╔И╔╕╔╤╓г╔Й╔С╔╞╓РЁ╚╓╞"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "╬Л╫Й╓Р╔Ё╔т║╪ (FIXME)"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "йлл╬╓гйщб╦ (FIXME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "йлл╬╓гйщб╦..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "%d й╛"
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "╨О╫Э"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d иц"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s ╓Ре╨иу"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ╔А╔ц╔╩║╪╔╦╓Р╡Рюо╫пмХ╓ч╓╩╓С╓г╓╥╓©, ╔╫║╪╔╧╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "фЭиу"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "╔А║╪╔К╔╒╔и╔Л╔╧:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "╨╧╫п©м"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr "йж©╝юХ"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "╟╦юХ"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP ╔в╔М╔╟╔И╔Ю╓нюъдЙ╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "╟е╧Ф╡╫╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓ои╫╪╗╓╥╓ч╓╩╓С"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "╟е╧Ф╡╫╓╣╓Л╓©╔А╔ц╔╩║╪╔╦"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "╔╒╔╓╔Ё╔С╓Р╔╞╔Й╔ц╔╞╓╥╓фиЭ╧Ф╡╫╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓о╔г╔╦╔©╔К╫Пл╬╓╣╓Л©╝мЙ╓г╓╜╓К╓Б╓н╓г╓╧"
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓о╔г╔╦╔©╔К╫Пл╬╓╣╓Л╓©╓Б╓н╓г╓╧╓╛, ©╝мЙ╓Р╬злю╫пмХ╓ч╓╩╓С"
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ╔╣╔╓╔х (%s) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "╔М║╪╔╚╔К╔у╔║╔╓╔К (%s) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP ╔╣╔╓╔х (%s) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "л╓цн╓нЁ╟иТ╔г║╪╔© (\"%s\" ╔©╔╓╔в) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "╓╫╓н╓Х╓╕╓й╔у╔╘╔К╔ю %s ╓о╓╒╓Й╓ч╓╩╓С"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "'%s' ╓Р╔╙║╪╔в╔СцФ"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р \"%s\" ╥а╪╟╓ьйя╧╧╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7582,7 +9154,7 @@ msgstr ""
 "╔у╔╘╔К╔ю╓н╔А╔©╬ПйС╓Рйщб╦╫пмХ╓ч╓╩╓С; ╓Б╓о╓Д╓Ё╓н╔у╔╘╔К╔ю╓РЁ╚╓╞\n"
 "╓Ё╓х╓╛╫пмХ╓й╓╓╓х╓©╓ж╓С╣╓╓е╓╓╓©╓н╓г╓╥╓Г╓╕: %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7590,12 +9162,12 @@ msgstr ""
 "╓Б╓╥╓Ё╓н╔А║╪╔К╔э╔ц╔╞╔╧╓РЁ╚╓╞╓Ё╓х╓о╓й╓╓╓й╓И\n"
 "╪Йф╟╓г╡СиЭ╓╣╓╩╓Ки╛мв╓╛╓╒╓К╓╚╓Б╓╥╓Л╓ч╓╩╓С"
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "╓Ё╓н╔╢╔ъх╒╔у╔╘╔К╔ю╓╚╓И╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr "%s ╓н╨фюъдЙ"
@@ -7618,104 +9190,129 @@ msgstr ""
 "аЮ╨Н╓н╫ЮхВ╓╥╓ф╓╓╓К╢ж╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "╓Ё╓н╔я╔╧╔О║╪╔и╓Р╣╜╡╠"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "╨Н╤хцФ"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "╔у╔╘╔К╔ю╓Р╧╧©╥цФ"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "╔А║╪╔К╓н╪У©╝"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ╓РаВ©╝цФ"
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "╔А╔ц╔╩║╪╔╦ %d / %d ╓РаВ©╝цФ"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "╔А╔ц╔╩║╪╔╦ %d / %d ╓о╪╨гт╓╥╓ч╓╥╓©"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "╢╟н╩╓╥╓ч╓╥╓©"
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s ╓ь╔А╔ц╔╩║╪╔╦╓Р╟эф╟цФ"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s ╓ь╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪цФ"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "╟эф╟цФ"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "╔Ё╔т║╪цФ"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ╓нцФ╓н╔у╔╘╔К╔ю╓РаЖ╨╨цФ"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "╓╢╓ъх╒"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "╔у╔╘╔К╔ю %s ╓Р╔╙║╪╔в╔СцФ"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "йщб╦╓╣╓Л╓© %s ╓Р╔╙║╪╔в╔СцФ"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "©╥╣╛╔у╔╘╔К╔ю╓Р╨Ню╝цФ"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "╔у╔╘╔К╔ю %s ╓Р╨О╫ЭцФ"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "╔у╔╘╔К╔ю╓Рф╠╢ЭцФ"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "╔у╔╘╔К╔ю╓Р╧╧©╥цФ"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "╔у╔╘╔К╔ю╓Р╨О╫ЭцФ"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "╔А╔ц╔╩║╪╔╦ %s ╓Р╪ХфюцФ"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╪ХфюцФ"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7724,7 +9321,7 @@ msgstr ""
 "╫пно╔у╔║╔╓╔К╓Р╨Ню╝╫пмХ╓ч╓╩╓С: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7733,11 +9330,11 @@ msgstr ""
 "╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "е╨иу╓Рйщб╦цФ"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7746,79 +9343,75 @@ msgstr ""
 "╫пно╔у╔║╔╓╔К╓Р╨Ню╝╫пмХ╓ч╓╩╓С: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "╔г║╪╔©╓Р╫Я╓╜╫п╓╧╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ╓х╓нюэбЁ╓Рюз╓ц╓ф╓╓╓ч╓╧"
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "╦║╨В(_S)"
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(╔©╔╓╔х╔К╓й╓╥╔А╔ц╔╩║╪╔╦)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(╔©╔╓╔х╔К╓й╓╥╔А╔ц╔╩║╪╔╦)"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "╔А╔ц╔╩║╪╔╦"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╦║╨В"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "бГй╦╩З/╬╝й╦╩З╓Р╤Хйл╓╧╓К"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr "а╟йЩ╦║╨В"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "╦║╨В:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "╔╜╔Ц╔С╔╩╔КцФ..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "╔А║╪╔К╓наВ╪У©╝"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "╪У©╝цФ"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "╧╧©╥цФ..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "бт╣║цФ..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "аВ©╝цФ"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr "╔Ф║╪╔╤╓к╓Х╓ц╓фаЮ╨Н╓Р╔╜╔Ц╔С╔╩╔К╓╣╓Л╓ч╓╥╓©"
 
@@ -7837,82 +9430,88 @@ msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╥╓© - %s"
 msgid "Forwarded message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "©╥╣╛╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Fwd: (╥Ол╬╓й╓╥)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "╔А╔ц╔╩║╪╔╦"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "л╓фи"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "╢Шфи"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "йжеЗ╨я╓ъ"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "йё©Т╓нл╓фи╔А╔ц╔╩║╪╔╦"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "йё©Т╓н╔А╔ц╔╩║╪╔╦"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "╨г╓БдЦ╓╓"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "дЦ╓╓"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "╧Б╓╓"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "╨г╓Б╧Б╓╓"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "╨ёфЭ╓н %p %l:%M"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "╨РфЭ╓н %p %l:%M"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%m╥Н %dфЭ %p %l:%M"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%Yг╞ %m╥Н %dфЭ"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
 
 #: mail/message-list.etspec.h:2
@@ -7929,38 +9528,78 @@ msgstr "╪У©╝цФ"
 msgid "Size"
 msgstr "╔╣╔╓╔╨:"
 
-#: 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:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "\"%s\" ╓нцФ╓н╔у╔╘╔К╔ю╓РаЖ╨╨цФ"
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "\"%s\" ╓н╣╜о©╓Р╪ХфюцФ"
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "\"%s\" ╓нцФ╓н╔у╔╘╔К╔ю╓РаЖ╨╨цФ"
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р╧ьфицФ"
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓н╧ьфи╡Р╫ЭцФ"
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "╔у╔╘╔К╔ю"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
+
+#: mail/subscribe-dialog.c:1547
+#, fuzzy
+msgid "Please select a server."
+msgstr "╔╣║╪╔с╔╧╓Ра╙бР"
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "╔Й╔╧╔х╓Р╧╧©╥"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "╔у╔╘╔К╔ю╓Ра╙бР"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "и╫╪╗╔╙╔в╔╥╔Г╔С"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "╧ьфи╢имЩ"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "╧ьфи"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "╧ьфи╡Р╫Э"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "╪б╧т╔╣╔ч╔Й╓н╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
@@ -7969,54 +9608,71 @@ msgstr "╪б╧т╔╣╔ч╔Й╓н╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
 msgid "Factory for the Evolution executive summary component."
 msgstr "Evolution ╪б╧т╔╣╔ч╔Й╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Evolution ╪б╧т╔╣╔ч╔Й║╪╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "лСб╚"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "лСб╚╓ни╫╪╗"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%p %I:%M"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%p %l:%M (%a)"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "╔А║╪╔К╔╣╔ч╔Й"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "л╬а╟:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "My Evolution"
+msgid "Summary Settings"
+msgstr "╔╣╔ч╔Й╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
 #: my-evolution/e-summary-rdf.c:281
 #, fuzzy
@@ -8028,7 +9684,12 @@ msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓Рфи╓ъ╧Ч╓ъцФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ╓к╔╗╔И║╪</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "юъдЙ"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "╔©╔╧╔╞╓ни╫╪╗"
@@ -8037,28 +9698,33 @@ msgstr "╔©╔╧╔╞╓ни╫╪╗"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "╓╫╓нб╬"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "╔╩╔╞╔╥╔Г╔С:"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
-msgstr "%Y/%B/%e %A"
+msgid "%A, %B %e %Y"
+msgstr "%Yг╞ %m╥Н %dфЭ %A"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "My Evolution"
+msgid "Print Summary"
+msgstr "╔╣╔ч╔Й║╪"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╟У╨Ч╓к╪╨гт╓╥╓ч╓╥╓©"
 
 #: my-evolution/main.c:52
@@ -8066,6 +9732,42 @@ msgstr "╔А╔ц╔╩║╪╔╦╓н╟У╨Ч╓к╪╨гт╓╥╓ч╓╥╓©"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
+#: my-evolution/metar.c:29
+msgid "F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "╔у╔╘╔С╔х"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "╟эф╟цФ"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "╔у╔ё╔К╔©"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "╔у╔ё╔К╔©"
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9257,130 +10959,146 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "йжеЗ╨я╓ъ"
+msgid " _Remove"
+msgstr "╨О╫Э"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "╔у╔╘╔К╔ю╓Ра╙бР"
+msgid "Add n_ew feed"
+msgstr "йжеЗ╨я╓ъ"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "╓╧╓ы╓ф╓ниу╓╜е╨╓╓"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "╓╧╓ы╓ф╓ниу╓╜е╨╓╓"
+msgid "All _folders:"
+msgstr "╔у╔╘╔К╔ю╓Ра╙бР"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "и╫╪╗╓╧╓К╔у╔╘╔К╔ю╓РЁ╚╩о╓╧╓К:"
+msgid "All news _feeds:"
+msgstr "йжеЗ╨я╓ъ"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "и╫╪╗╔╙╔в╔╥╔Г╔С"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "и╫╪╗"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
 #, fuzzy
-msgid "Five days"
-msgstr "╤БмкфЭ"
+msgid "News Feed Settings"
+msgstr "юъдЙ"
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "╥Н"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "1 ╫╣╢ж"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
 #, fuzzy
-msgid "News Feed Settings"
-msgstr "юъдЙ"
+msgid "Show _all tasks"
+msgstr "╔©╔╧╔╞╓ни╫╪╗"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "╔©╔╧╔╞╓ни╫╪╗"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "1 фЭ"
+msgid "Tasks "
+msgstr "╔©╔╧╔╞"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "╥Н"
+msgid "Units: "
+msgstr ""
+"\n"
+"  иТ╫П:  "
 
 #: 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 ""
+msgid "Weather settings"
+msgstr "а╙бР╓╣╓Л╓©╓Б╓н╓Р╔╞╔Й╔╒╓╥╓ч╓╧"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr ""
-"╔╧╔╠╔╦╔Е║╪╔К\n"
-"╩Ч╢ж"
+msgid "_Display folders:"
+msgstr "и╫╪╗╓╧╓К╔у╔╘╔К╔ю╓РЁ╚╩о╓╧╓К:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "╔©╔╧╔╞╓ни╫╪╗"
+msgid "_Display stations:"
+msgstr "и╫╪╗╔╙╔в╔╥╔Г╔С"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "╓╧╓ы╓ф╓н╔ь╔ц╔ю╓Ри╫╪╗(_H)"
+msgid "_Displayed feeds:"
+msgstr "и╫╪╗"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "╔©╔╧╔╞╓ни╫╪╗"
+msgid "_Five days"
+msgstr "╤БмкфЭ"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "╔©╔╧╔╞"
+msgid "_Mail"
+msgstr "╔А║╪╔К"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  иТ╫П:  "
+msgid "_News Feeds"
+msgstr "юъдЙ"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "╓╫╓нб╬"
+msgid "_One day"
+msgstr "1 фЭ"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "а╙бР╓╣╓Л╓©╓Б╓н╓Р╔╞╔Й╔╒╓╥╓ч╓╧"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "4 ╥Н"
+msgid "_Schedule"
+msgstr ""
+"╔╧╔╠╔╦╔Е║╪╔К\n"
+"╩Ч╢ж"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "╓╧╓ы╓ф╓н╔ь╔ц╔ю╓Ри╫╪╗(_H)"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "╓╫╓нб╬"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "4 ╥Н"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9397,7 +11115,17 @@ msgstr "╬э╨ы"
 msgid "Cancel Operation"
 msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "фцйл╓й╔у╔╘╔К╔ю"
@@ -9449,7 +11177,7 @@ msgid ""
 "`%s'."
 msgstr "╔у╔║╔╓╔Кфи╧ЧцФ╓н╢ж╓к╔╗╔И║╪╓ох╞ю╦╓╥╓ч╓╥╓©"
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9460,7 +11188,7 @@ msgstr ""
 "Evolution ╔Ф║╪╔╤╔у╔║╔╓╔К╓н╔╓╔С╔╧╔х║╪╔К╓Р\n"
 "╣Жмф╓╧╓К╓©╓А╓к╟эф╟╓╥╓ф╡╪╓╣╓╓"
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9474,7 +11202,7 @@ msgstr ""
 "╨О╫Э╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧\n"
 "╓Ё╓н╔г╔ё╔Л╔╞╔х╔Й╓Р╨О╫Э╓╥╓ч╓╧╓╚?"
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9485,55 +11213,78 @@ msgstr ""
 "╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С║╔Evolution ╔Ф║╪╔╤\n"
 "╔у╔║╔╓╔К╓н╔╓╔С╔╧╔х║╪╔К╓Р╣Жмф╓╧╓К╓©╓А╓к╟эф╟╓╥╓ф╡╪╓╣╓╓"
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "╔у╔╘╔К╔ю╓Р╪Хфю╫пмХ╓ч╓╩╓С: %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "'%s' ╓нцФ╓к╔у╔║╔╓╔К╓Р\n"
 "╔Ё╔т║╪╫пмХ╓ч╓╩╓С"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р╔Ё╔т║╪╓╧╓К╔у╔╘╔К╔ю╓Р╩ьдЙ╓╥╓ч╓╧:"
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "╔у╔╘╔К╔ю╓н╔Ё╔т║╪"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р╟эф╟╓╧╓К╔у╔╘╔К╔ю╓Р╩ьдЙ╓╥╓ч╓╧:"
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "╔у╔╘╔К╔ю╓н╟эф╟"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"╔у╔╘╔К╔ю `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "╓Ё╓н╔у╔╘╔К╔ю╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "кэеЖ╓к╔©╔╧╔╞ `%s' ╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "╔у╔╘╔К╔ю %s ╓Р╨О╫ЭцФ"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "╔Й╔м║╪╔Ю(_R)..."
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "╔у╔╘╔К╔юл╬:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9547,7 +11298,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "╩ьдЙ╓╣╓Л╓©╔у╔╘╔К╔юл╬╓ом╜╦З╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ©╥╣╛╔у╔╘╔К╔ю╓н╨Ню╝"
 
@@ -9559,11 +11310,11 @@ msgstr ""
 "а╙бР╓╥╓©╔у╔╘╔К╔ю╓н╪Ойл╓омв╣А╓╣╓Л╓©аЮ╨Н╓н╓©╓А╓к\n"
 "м╜╦З╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "©╥╣╛..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(╔©╔╓╔х╔К╓й╓╥)"
 
@@ -9575,12 +11326,11 @@ 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.
@@ -9604,7 +11354,7 @@ msgstr ""
 "%s ╓Р╔╓╔С╔щ║╪╔хцФ\n"
 "╔╒╔╓╔ф╔Ю %d ╓Р╔╓╔С╔щ║╪╔хцФ"
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9653,7 +11403,7 @@ msgstr "╪╚ф╞"
 msgid "Filename:"
 msgstr "╔у╔║╔╓╔Кл╬:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "╔у╔║╔╓╔К╓Ра╙бР"
 
@@ -9661,31 +11411,53 @@ msgstr "╔у╔║╔╓╔К╓Ра╙бР"
 msgid "File type:"
 msgstr "╔у╔║╔╓╔К╪Ойл:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "╔у╔╘╔К╔ю╓Ра╙бР"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr "╓Ё╓н╔г║╪╔©╓Р╔╓╔С╔щ║╪╔х╓╧╓КаВ╓ЙюХ╓н╔у╔╘╔К╔ю╓Ра╙бР╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr "юэбЁ╓Рйд╓╦╓ф╓╓╓ч╓╧..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ╓о╓╒╓й╓©╓н $PATH ╓к╓о╦╚╓д╓╚╓Й╓ч╓╩╓С"
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ╓о╪б╧т╓г╓╜╓ч╓╩╓С╓г╓╥╓©"
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9697,92 +11469,109 @@ msgstr ""
 "╔╟╔К║╪╔в╔╕╔╖╔╒╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╓н\n"
 "╔я╔ц╔╠║╪╔╦╔╫╔у╔х╓г╓╧"
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr "Ё╚╓╜╓©╓╓╔у╔╘╔К╔ю╓Ра╙бР╓╥╓ч╓╧"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "©╥╣╛╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Ё╚╓╜╓©╓╓╔у╔╘╔К╔ю╓Ра╙бР╓╥╓ч╓╧"
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "╔╙╔С╔И╔╓╔С╨Н╤х"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "╔╙╔у╔И╔╓╔С╨Н╤х"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(и╫╪╗╓╥╓©╔у╔╘╔К╔ю╓о╓╒╓Й╓ч╓╩╓С)"
 
-#. 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution - %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Evolution "
-"╓о╦╫╨ъ╔╙╔С╔И╔╓╔С╓г╓╧║╔╔╙╔у╔И╔╓╔С╓к╓╧╓К╓к╓о╓Ё╓н╔э╔©╔С╓Р╔╞╔Й╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓"
+"Evolution ╓о╦╫╨ъ╔╙╔С╔И╔╓╔С╓г╓╧║╔╔╙╔у╔И╔╓╔С╓к╓╧╓К╓к╓о╓Ё╓н╔э╔©╔С╓Р╔╞╔Й╔ц╔╞╓╥╓ф"
+"╓╞╓ю╓╣╓╓"
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution ╓о╔╙╔у╔И╔╓╔С╫ХмЩцФ╓г╓╧"
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Evolution "
-"╓о╦╫╨ъ╔╙╔у╔И╔╓╔С╓г╓╧║╔╔╙╔С╔И╔╓╔С╓к╓╧╓К╓к╓о╓Ё╓н╔э╔©╔С╓Р╔╞╔Й╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓"
+"Evolution ╓о╦╫╨ъ╔╙╔у╔И╔╓╔С╓г╓╧║╔╔╙╔С╔И╔╓╔С╓к╓╧╓К╓к╓о╓Ё╓н╔э╔©╔С╓Р╔╞╔Й╔ц╔╞╓╥╓ф"
+"╓╞╓ю╓╣╓╓"
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "╤ииТ╣╜╡╠аУцж╓н╔╩╔ц╔х╔╒╔ц╔в╓╛╫пмХ╓ч╓╩╓С -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views 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
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "╔А╔ц╔╩║╪╔╦╓нфБмф╓ол╣╦З╓г╓╧"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "╔╥╔╖╔К╓г╔╧╔х╔Л║╪╔╦╓Репо©╫пмХ╓ч╓╩╓С"
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "╟Лхле╙╓й╔╗╔И║╪"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "©╥╣╛╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "╔╟╔К║╪╔вл╬:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9791,183 +11580,169 @@ msgstr ""
 "кэеЖ╓к╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓╚╓И╔╟╔К║╪╔в\n"
 "`%s' ╓Р╨О╫Э╓╥╓©╓╓╓г╓╧╓╚?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "╨О╫Э╓╥╓ч╓╩╓С"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "╬╝╓╣╓╓╔╒╔╓╔Ё╔С(_S)"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "╬╝╓╣╓╓╔╒╔╓╔Ё╔С╓г╔╥╔Г║╪╔х╔╚╔ц╔х╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "бГ╓╜╓╓╔╒╔╓╔Ё╔С(_L)"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "бГ╓╜╓╓╔╒╔╓╔Ё╔С╓г╔╥╔Г║╪╔х╔╚╔ц╔х╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "©╥╣╛╔╟╔К║╪╔в(_N)..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "©╥╣╛╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "╓Ё╓н╔╟╔К║╪╔в╓Р╨О╫Э(_R)..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "╓Ё╓н╔╟╔К║╪╔в╓Р╨О╫Э(_R)..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓Р╠ё╓╧(_H)"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓Р╠ё╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 #, fuzzy
 msgid "Open the folder linked to this shortcut"
 msgstr "йл╓н╔╕╔ё╔С╔и╔╕╓г╓Ё╓н╔у╔╘╔К╔ю╓РЁ╚╓╜╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "©╥╣╛╔╕╔ё╔С╔и╔╕╓гЁ╚╓╞"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓╚╓И╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╓нйщб╦цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, 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
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(л╬а╟╓й╓╥)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "╔╗╔И║╪╓о╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "╟Лхле╙╓й╔╗╔И║╪"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "ф╠╓╦л╬а╟╓н╔у╔╘╔К╔ю╓╛╓╧╓г╓кб╦╨ъ╓╥╓ф╓╓╓ч╓╧"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "╩ьдЙ╓╣╓Л╓©╔у╔╘╔К╔ю╪Ойл╓ом╜╦З╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "I/O ╔╗╔И║╪"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "╔у╔╘╔К╔ю╓Р╨Ню╝╓╧╓К╫╫й╛╓й╤У╓╜╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "╩ьдЙ╓╣╓Л╓©╔у╔╘╔К╔ю╓о╦╚иу╓╚╓Й╓ч╓╩╓С╓г╓╥╓©"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "╣║г╫╓о╓Ё╓н╣╜╡╠аУцж╓г╓о╪баУ╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "аЮ╨Н╓о╔╣╔щ║╪╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "╩ьдЙ╓╣╓Л╓©╪Ойл╓о╓Ё╓н╣╜╡╠аУцж╓г╓о╔╣╔щ║╪╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "╩ьдЙ╓╣╓Л╓©╔у╔╘╔К╔ю╓о╦╚иу╓╚╓Й╓ч╓╩╓С╓г╓╥╓©"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% ╢╟н╩(_l):"
 
@@ -9989,10 +11764,6 @@ msgstr "╔ш╔╧╔х:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "╔у╔╘╔К╔юл╬:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "╔у╔╘╔К╔ю╪Ойл:"
@@ -10004,21 +11775,33 @@ msgstr "╔у╔╘╔К╔ю╓Р╨Ню╝╓╧╓К╬Л╫Й╓Р╩ьдЙ╓╥╓ф╓╞╓ю╓╣╓╓:"
 #: 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"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Evolution ╔╓╔С╔щ║╪╔х╔Ф║╪╔ф╔ё╔Й╔ф╔ё"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Evolution ╔╓╔С╔щ║╪╔х╔Ф║╪╔ф╔ё╔Й╔ф╔ё"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "╔у╔║╔╓╔К╓Ра╙бР"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "╓Х╓╕╓Ё╓╫, Evolution ╔╓╔С╔щ║╪╔х╔Ф║╪╔ф╔ё╔Й╔ф╔ё╓ь\n"
@@ -10038,10 +11821,11 @@ msgid "Don't ask me again"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓РфСеы╓хи╫╪╗╓╥╓й╓╓"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
-msgstr ""
+#, fuzzy
+msgid "Evolution can import data from the following files:"
+msgstr "╔А║╪╔К╓Р╟╥╓╕╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10073,7 +11857,7 @@ msgstr ""
 "╡Ф║╧╓о╓╒╓й╓©╓╛╡Ф║╧╓ню╝╡л╓РЁз╓╥╓Ю╓Ё╓х╓Рк╬╓С╓г╓╓╓ч╓╧║╔╓╫╓╥╓ф╡Ф║╧╓о\n"
 "г╝©╢╓к╓╒╓й╓©╓н╧в╦╔╓Рбт╓а╪У╓╠╓ф╓╓╓ч╓╧!\n"
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10081,25 +11865,30 @@ msgstr ""
 "╓╒╓Й╓╛╓х╓╕\n"
 "Evolution ╔а║╪╔Ю\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Evolution ╔╥╔╖╔К╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Evolution ╔╥╔╖╔К╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "╔╧╔в╔И╔ц╔╥╔Е╡Хлл╓Рл╣╦З╓к╓╧╓К"
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr "╓╧╓ы╓ф╓н╔Ё╔С╔щ║╪╔м╔С╔х╓н╔г╔п╔ц╔╟╫пно╓Р╔у╔║╔╓╔К╓ьаВ╓К"
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo ╔Ё╔С╔щ║╪╔м╔С╔х╔╥╔╧╔ф╔Ю╓Р╫И╢Э╡╫╫пмХ╓ч╓╩╓С"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "╔Ё╔т║╪"
 
@@ -10116,11 +11905,11 @@ msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х╓Р╨Ню╝╓╥╓ч╓╧"
 msgid "Create new contact list"
 msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "юз╓Й╪Х╓Й"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "а╙бР╓╣╓Л╓©╓Б╓н╓Рюз╓Й╪Х╓Й╓ч╓╧"
 
@@ -10128,77 +11917,120 @@ msgstr "а╙бР╓╣╓Л╓©╓Б╓н╓Рюз╓Й╪Х╓Й╓ч╓╧"
 msgid "Delete selected contacts"
 msgstr "а╙бР╓╥╓©╔Ё╔С╔©╔╞╔х╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "╔к╔Е║╪╔╧"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "е╫╓Йиу╓╠"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "╔╞╔Й╔ц╔в╔э║╪╔и╓ье╫╓Йиу╓╠╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "╟У╨Ч╓╣╓Л╓К╔╚╔Л╔С╔ю╓н╔в╔Л╔с╔Е║╪╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "а╙бР╓╥╓©╔Ё╔С╔©╔╞╔х╓Р╟У╨Ч╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "а╙бР╓╥╓©╔Ё╔С╔©╔╞╔х╓Р╨О╫Э╓╥╓ч╓╧"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "╓╧╓ы╓фа╙бР"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "╓╧╓ы╓ф╓н╔Ё╔С╔©╔╞╔х╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "╔Ё╔С╔©╔╞╔х╓ь╔А╔ц╔╩║╪╔╦╓РаВ©╝(_m)..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "а╙бР╓╥╓©╔Ё╔С╔©╔╞╔х╓Р╨О╫Э╓╥╓ч╓╧"
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "╔Ё╔С╔©╔╞╔хюХ╓ь╔А╔ц╔╩║╪╔╦╓РаВ©╝"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "б╬╓ь╔Ё╔С╔©╔╞╔х╓РаВ©╝"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "дД╩ъ"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "╠с╓ъ╧Ч╓ъ╓РдД╩ъ╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "ф╟╨Н(_A)"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "╔╒╔и╔Л╔╧д╒╓н╔╫║╪╔╧(_A)..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "╔Ё╔С╔©╔╞╔х(_C)"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "╔Ё╔С╔©╔╞╔х(_C)..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "╟У╨Ч(_P)..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "VCard ╓гйщб╦"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "╔Ё╔С╔©╔╞╔х╓н╦║╨В(_S)"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "╓╧╓ы╓фа╙бР(_A)"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "╔д║╪╔К(_T)"
 
@@ -10208,112 +12040,131 @@ 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"
-msgstr "©╥╣╛лСб╚╓Р╨Ню╝╓╥╓ч╓╧"
+msgid "Create a New _Task"
+msgstr "©╥╣╛╔©╔╧╔╞╓Р╨Ню╝╓╥╓ч╓╧"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "©╥╣╛лСб╚╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "фЭ"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "╓Ё╓нлСб╚╓Р╨О╫Э"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "╟эф╟"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "╩Ч╢ж╓РлА╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "╩Ч╢ж╓Р©й╓А╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "╩ьдЙфЭ╓к╟эф╟(_D)"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "╩ьдЙфЭ╓к╟эф╟╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "╦╫╨ъ╓н╩Ч╢ж╓ь╟эф╟╓╥╓ч╓╧"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "╨ёфЭ╓ь╟эф╟"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "╥Н(_M)"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "©╥╣╛лСб╚"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "©╥╣╛╔©╔╧╔╞"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "╟У╨Ч╓╣╓Л╓К╔╚╔Л╔С╔ю╓н╔в╔Л╔с╔Е║╪╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "╔╚╔Л╔С╔ю╓н╟У╨Ч"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "╓Ё╓н╔╚╔Л╔С╔ю╓н╟У╨Ч╓╥╓ч╓╧"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪(_v)"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "и╛©э╬ПйС"
+msgid "Print this calendar"
+msgstr "╓Ё╓н╔╚╔Л╔С╔ю╓н╟У╨Ч╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "1 фЭ╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "1 ╔Ж╥Н╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "1 ╫╣╢ж╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "╫╣╢жо╚ф╞╩Ч╢ж╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "╫╣╢жо╚ф╞╩Ч╢ж(_o)"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "╫╣"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "лСб╚(_A)"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "╔А║╪╔КюъдЙ(_M)..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "фЭ(_D)"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "╥Н(_M)"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "и╛©э╬ПйС"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "╫╣(_W)"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "╔©╔╧╔╞(_T)"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10324,15 +12175,16 @@ msgid "Close"
 msgstr "йд╓╦╓К"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "╓Ё╓нлСб╚╓Рйд╓╦╓ч╓╧"
+#, fuzzy
+msgid "Close this item"
+msgstr "╓Ё╓н╔╒╔╓╔ф╔Ю╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "╓Ё╓нлСб╚╓Р╨О╫Э"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "╓Ё╓н╔╒╔╓╔ф╔Ю╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "╔А╔╓╔С╔д║╪╔К╔п║╪"
 
@@ -10341,117 +12193,85 @@ msgstr "╔А╔╓╔С╔д║╪╔К╔п║╪"
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "╟У╨Ч..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "йщб╦"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "╔©╔╧╔╞╓Рйщб╦╓╥╓ф╔ю╔╓╔╒╔М╔╟╔э╔ц╔╞╔╧╓Рйд╓╦╓ч╓╧"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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 "╨О╫Э..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "╔ь╔К╔в"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "и╫╩Ф╓Р╟У╨Ч(_v)..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "йлл╬╓гйщб╦(_A)..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "╔Ё╔С╔©╔╞╔х╓Рйщб╦╓╥╓ф╓Ё╓н╔ю╔╓╔╒╔М╔╟╔э╔ц╔╞╔╧╓Рйд╓╦╓ч╓╧"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "б╬╓ь╔Ё╔С╔©╔╞╔х╓РаВ©╝(_n)..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "╔╙╔С╔И╔╓╔С╔ь╔К╔в╓Р╩╡╬х╓╥╓ф╓╞╓ю╓╣╓╓"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "╔Ё╔С╔©╔╞╔х╓ь╔А╔ц╔╩║╪╔╦╓РаВ©╝(_m)..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "йщб╦(_S)"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "╓Ё╓н╔╒╔╓╔ф╔Ю╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "╨О╫Э..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "╔©╔╧╔╞╓Рйщб╦╓╥╓ф╔ю╔╓╔╒╔М╔╟╔э╔ц╔╞╔╧╓Рйд╓╦╓ч╓╧"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "б╬╓ь╔Ё╔С╔©╔╞╔х╓РаВ©╝(_n)..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "╔Ё╔С╔©╔╞╔х╓ь╔А╔ц╔╩║╪╔╦╓РаВ©╝(_m)..."
@@ -10461,22 +12281,22 @@ msgstr "╔Ё╔С╔©╔╞╔х╓ь╔А╔ц╔╩║╪╔╦╓РаВ©╝(_m)..."
 msgid "Cancel Mee_ting"
 msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 #, fuzzy
 msgid "Cancel the meeting for this item"
 msgstr "╓Ё╓н╔у╔╘╔К╔ю╓нюъдЙ╓Рйя╧╧╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "vCalender╓х╓╥╓фе╬аВ(_C) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10491,16 +12311,11 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr "бг╧Г╓╩╓н╔╧╔╠╔╦╔Е║╪╔К(_M)"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 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 "ф╟╨Н(_A)"
-
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customise My Evolution"
 msgstr "My Evolution ╓н╔╚╔╧╔©╔ч╔╓╔╨"
@@ -10514,68 +12329,65 @@ msgid "Cancel the current mail operation"
 msgstr "╦╫╨ъ╓н╔А║╪╔КаЮ╨Н╓Р╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╧"
 
 #: 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
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr "╔А║╪╔К╔╒╔╚╔╕╔С╔х╓хб╬╓нюъдЙ╓Р╨Ню╝/йт╫╦╓╥╓ч╓╧"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "©╥╣╛╔А║╪╔К╓Р╔у╔ё╔К╔©╓╧╓К╔К║╪╔К╓н╨Ню╝/йт╫╦╓Р╓╥╓ч╓╧"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "╡╬аш╔у╔╘╔К╔ю╓ндЙ╣а╓Р╨Ню╝/йт╫╦╓╥╓ч╓╧"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "╔╢╔ъх╒╓Р╤У╓к╓╧╓К(_T)"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "╔я╔╧╔О║╪╔и╓нй╤╪╨(_P)"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "╣╜╡╠╓╥╓©╔я╔╧╔О║╪╔и╓Рк╨╓Л╓©╬Л╧Г╓к╨ф╓си╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "дЙ╢Э╧ьфи╢имЩ(_S)..."
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "╪║╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "╔А║╪╔К╓Р╨Ню╝╓╧╓К╓©╓А╓к╔╕╔ё╔С╔и╔╕╓РЁ╚╓╜╓ч╓╧"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "╓╧╓ы╓ф╓н╔у╔╘╔К╔ю╓╚╓И╨О╫Э╔ч║╪╔╞╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠й╣ве╙╓к╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "аВ╪У©╝"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "╔╜╔Е║╪╓к╓╒╓К╔А║╪╔К╓РаВ©╝╓╥╓ф©╥╣╛╔А║╪╔К╓Р╪Хфю╓╥╓ч╓╧"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Show message preview window"
 msgstr "дл╬О╓н╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "╔╣║╪╔п╬Е╓н╔у╔╘╔К╔ю╓н╧ьфи/╧ьфи╡Р╫Э╓Р╓╥╓ч╓╧"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "╡╬аш╔у╔╘╔К╔ю╔╗╔г╔ё╔©(_E)..."
 
@@ -10600,92 +12412,103 @@ msgstr "╔в╔Л╔с╔Е║╪"
 msgid "_Send / Receive"
 msgstr "аВ╪У©╝(_S)"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р╧ьфицФ"
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "╓Ё╓н╔у╔╘╔К╔ю╓нюъдЙ╓Рйя╧╧╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_e)"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "юз╓Й╪Х╓Й"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_e)"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "╨О╫Э╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_D)"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "╢Шфи╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_R)"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "и╫╪╗╓╥╓ф╓╓╓К╔А╔ц╔╩║╪╔╦╓г╓о╓й╓╞╨О╫Э╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "╢Шфи╓х╓╥╓ф╓╧╓ы╓ф╔ч║╪╔╞(_e)"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "╢Шфи╓х╓╥╓ф╓╧╓ы╓ф╓н╔А╔ц╔╩║╪╔╦╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "╔╞╔Й╔ц╔в╔э║╪╔и╓ье╫╓Йиу╓╠╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "╓Ё╓н╔у╔╘╔К╔ю╓╚╓И╨О╫Э╔ч║╪╔╞╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠й╣ве╙╓к╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "╓╧╓ы╓фа╙бР(_A)"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "╔╧╔Л╔ц╔и╓Ра╙бР(_T)"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "╦╫╨ъа╙бР╓╣╓Л╓ф╓╓╓й╓╓╔А╔ц╔╩║╪╔╦╓ю╓╠╓Р╓╧╓ы╓фа╙бР╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓хф╠╓╦╔╧╔Л╔ц╔и╓н╔А╔ц╔╩║╪╔╦╓Р╓╧╓ы╓фа╙бР╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "╓╧╓ы╓ф╓н╔А╔ц╔╩║╪╔╦╓Ра╙бР╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "╓╧╓ы╓фи╫╪╗(_A)"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "╢Шфи╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_R)"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "╟Л╩Че╙╓к╠ё╓╥╓©╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "╓╧╓ы╓ф╓н╢Шфи╔А╔ц╔╩║╪╔╦╓Р╟Л╩Че╙╓к╠ё╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟Л╩Че╙╓к╠ё╓╥╓ч╓╧"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓Р╔╧╔Л╔ц╔и╡╫╓╥╓ч╓╧"
 
@@ -10693,7 +12516,7 @@ msgstr "╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓Р╔╧╔Л╔ц╔и╡╫╓╥╓ч╓╧"
 msgid "_Expunge"
 msgstr "кУ╬ц(_E)"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "╔у╔╘╔К╔ю(_F)"
 
@@ -10701,11 +12524,11 @@ msgstr "╔у╔╘╔К╔ю(_F)"
 msgid "_Invert Selection"
 msgstr "а╙бР╓Рх©е╬(_I)"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "╔в╔М╔я╔ф╔ё(_P)..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
 msgstr "╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓Р╔╧╔Л╔ц╔и╡╫(_T)"
 
@@ -10931,7 +12754,8 @@ 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"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "╟У╨Ч╓╣╓Л╓К╔А╔ц╔╩║╪╔╦╓н╔в╔Л╔с╔Е║╪╓Ри╫╪╗╓╥╓ч╓╧"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10953,39 +12777,35 @@ msgstr "а╟╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
 msgid "Previous Unread Message"
 msgstr "а╟╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪..."
-
-#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Print this message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "йж©╝"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "а╢╟В╓ьйж©╝"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╦║╨В(_e)"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓ь╔А╔ц╔╩║╪╔╦╓Рйщб╦╓╥╓ч╓╧"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr "и╫╪╗╓╣╓Л╓©╔А╔ц╔╩║╪╔╦кэбн╓н╢ч╓ч╓Л╓К╔ф╔╜╔╧╔х╓Р╦║╨В╓╥╓ч╓╧"
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "╦╫╨ъ╓н╔в╔Й╔С╔©╓н╔з║╪╔╦юъдЙ╓Р╧т╓╓╓ч╓╧"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "╔А║╪╔К╓н╔╫║╪╔╧╓Ри╫╪╗(_S)"
@@ -11026,67 +12846,51 @@ msgstr "╪У©╝╪т╓н╡╬аш╔у╔╘╔К╔ю(_R)..."
 msgid "VFolder on _Subject..."
 msgstr "╥Ол╬╓н╡╬аш╔у╔╘╔К╔ю(_S)..."
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "╔у╔ё╔К╔©е╛мя(_A)"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr "╔у╔╘╔К╔ю╓ь╔Ё╔т║╪(_C)"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓╚╓И╔у╔ё╔К╔©╓Р╨Ню╝(_C)"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ(_F)"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr "╔А╔ц╔╩║╪╔╦и╫╪╗(_M)"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟(_M)"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr "дл╬Ои╫╪╗(_N)"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓РЁ╚╓╞(_O)"
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Re-send Message"
-msgstr "╔А╔ц╔╩║╪╔╦╓Р╨фаВ©╝(_R)"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "╓Ё╓н╔╕╔ё╔С╔и╔╕╓Рйд╓╦╓ч╓╧"
 
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "йд╓╦╓К(_C)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "и╫╪╗(_V)"
 
@@ -11151,11 +12955,6 @@ msgstr "S/MIME ╓к╓Х╓К╟е╧Ф╡╫"
 msgid "S/MIME Sign"
 msgstr "S/MIME ╫Пл╬"
 
-#: 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 "йлл╬╓гйщб╦"
@@ -11284,7 +13083,7 @@ msgstr "йж©╝юХ╔у╔ё║╪╔К╔и(_R)"
 msgid "_Security"
 msgstr "╔╩╔╜╔Е╔Й╔ф╔ё(_S)"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "╔ь╔К╔в(_H)"
 
@@ -11318,15 +13117,28 @@ msgstr "╧ьфи╡Р╫Э"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "╔©╔╧╔╞╓нЁДеЖ╓ф(_n) (FIXME)"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "╔╜╔Ц╔С╔╩╔К"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "╓Ё╓н╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
+msgid "Cancel this task"
+msgstr "╔╜╔Ц╔С╔╩╔К"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "╔Й╔╧╔х╓Р╧╧©╥"
@@ -11335,43 +13147,31 @@ msgstr "╔Й╔╧╔х╓Р╧╧©╥"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "а╙бР╓╥╓©╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "©╥╣╛╔©╔╧╔╞╓Р╨Ню╝╓╥╓ч╓╧"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "а╙бР╓╥╓©╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "а╙бР╓╥╓©╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr "©╥╣╛╔©╔╧╔╞"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "╔А║╪╔КюъдЙ(_M)..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "╔©╔╧╔╞(_T)"
 
@@ -11403,175 +13203,155 @@ msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓к╓Ё╓н╔у╔╘╔К╔ю╓н╔Й╔С╔╞╓Р╨Ню╝╓╥╓ч╓╧"
 msgid "Create a new folder"
 msgstr "©╥╣╛╔у╔╘╔К╔ю╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
 msgstr "╓Ё╓н╔у╔╘╔К╔ю╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "йл╓н╔у╔╘╔К╔ю╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "╫╙н╩(_x)"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr "Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "Evolution ╔╕╔ё╔С╔и╔╕(_W)"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "╔в╔М╔╟╔И╔Ю╓Р╫╙н╩╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "╩о╓А╓к(_S)"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Ё╟иТ╔у╔║╔╓╔К╥а╪╟╓Р╔╓╔С╔щ║╪╔х╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "йл╓н╬Л╫Й╓ь╓Ё╓н╔у╔╘╔К╔ю╓Р╟эф╟╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "©╥╣╛╔╕╔ё╔С╔и╔╕╓гЁ╚╓╞(_W)"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "йл╓н╔╕╔ё╔С╔и╔╕╓г╓Ё╓н╔у╔╘╔К╔ю╓РЁ╚╓╜╓ч╓╧"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Evolution ╓к╓д╓╓╓ф╓н╬ПйС╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "ит╤Я╧ГйС╧П╓ндС╫п"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "ит╤Я╧ГйС╧П╓ндС╫п(_B)"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy╓Р╩х╓ц╓фит╤Я╧ГйС╧П╓РдС╫п╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "юзбь╓╗"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "╔у╔╘╔К╔ю╔п║╪╓Ри╫╪╗╓╧╓К╓╚╓и╓╕╓╚юзбь╓╗╓ч╓╧"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓Ри╫╪╗╓╧╓К╓╚╓и╓╕╓╚юзбь╓╗╓ч╓╧"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "╔╙╔у╔И╔╓╔С╨Н╤х╓╚╓и╓╕╓╚╓Рюзбь╓╗╓ч╓╧"
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr "╔Ё╔С╔©╔╞╔х╔ч╔м║╪╔╦╔Ц╓Р╩х╓╕(_o)"
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr "╔╚╔Л╔С╔ю╓Р╩х╓╕(_C)"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "╔А║╪╔И╓Р╩х╓╕(_M)"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "а╙бР╓╣╓Л╓©╔у╔╘╔К╔ю╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "Evolution ╓к╓д╓╓╓ф(_A)..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "лСб╚(_A) (FIXME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "╔Ё╔С╔©╔╞╔х(_C) (FIXME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "╔Ё╔т║╪(_C)..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "╔у╔╘╔К╔ю╔п║╪(_F)"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟(_G)..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "╔у╔║╔╓╔К╓Р╔╓╔С╔щ║╪╔х(_I)..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "╔╓╔С╔г╔ц╔╞╔╧(_I)"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "╔А╔ц╔╩║╪╔╦╓Р╔А║╪╔К(_M)"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "╟эф╟(_M)..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "©╥╣╛(_N)"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "©╥╣╛╔у╔╘╔К╔ю(_N)"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "╔Й╔м║╪╔Ю(_R)..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪(_S)"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪(_S)"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "╔©╔╧╔╞(_T) (FIXME)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "╔╙╔у╔И╔╓╔С╨Н╤х(_W)"
 
 #: ui/my-evolution.xml.h:1
 #, fuzzy
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr "╓Ё╓н╔у╔╘╔К╔ю╓нюъдЙ╓Рйя╧╧╓╥╓ч╓╧"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr "╔А║╪╔К╔╣╔ч╔Й"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "╢Шфи"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
 msgstr "╔А║╪╔КюъдЙ(_M)..."
 
 #: views/addressbook/galview.xml.h:1
@@ -11606,6 +13386,30 @@ msgstr "╔А╔ц╔╩║╪╔╦"
 msgid "With Category"
 msgstr "╔╚╔ф╔╢╔Й"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "╔у╔║╔╓╔К╓Ра╙бР"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "╔╩╔╞╔╥╔Г╔С:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"╔©╔╓╔Ю╔╬║╪╔С: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11613,10 +13417,6 @@ msgstr "╔╚╔ф╔╢╔Й"
 msgid "%A, %B %d, %Y"
 msgstr "%Yг╞ %m╥Н %dфЭ %A"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "╔с╔╦║╪"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "╔╙╔у╔ё╔╧╓нЁ╟"
@@ -11689,7 +13489,7 @@ msgstr "╓╧╓ы╓ф╓ниу╓╜е╨╓╓"
 msgid "_Current View"
 msgstr "╦╫╨ъ╓ни╫╪╗(_C)"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "и╫╪╗╓РдЙ╣а"
 
@@ -11699,19 +13499,20 @@ msgstr "и╫╪╗╓РдЙ╣а"
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%Y %B"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "╨ё"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "╨ёфЭ"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "╩Ч╢ж╓о╔у╔╘║╪╔ч╔ц╔х╓кфЧ╓Л╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С: %s"
@@ -11800,35 +13601,33 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "╔Ё╔С╔©╔╞╔х╔╗╔г╔ё╔©"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "╦║╨В╓Рйщб╦"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "╬Е╣И╦║╨В"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "╦║╨В╓Рйщб╦"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "╔╞╔Й╔╒(_l)"
 
 #: 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 "╔╗╔И║╪"
@@ -11846,10 +13645,15 @@ msgstr "╔А╔ц╔╩║╪╔╦"
 msgid "Don't show this message again."
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓РфСеы╓хи╫╪╗╓╥╓й╓╓"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "╦║╨В(_c)"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "╦║╨В"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "╔я║╪╔╫╔й╔К╔╒╔и╔Л╔╧д╒╔╣║╪╔п"
@@ -11870,6 +13674,302 @@ msgstr "init_corba(): GNOME ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
+#~ msgid "RDF Summary"
+#~ msgstr "RDF ╔╣╔ч╔Й"
+
+#~ msgid "LDAP Server"
+#~ msgstr "LDAP ╔╣║╪╔п"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "л╓цн╓н╔╒╔и╔Л╔╧д╒╪Ойл"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "╓й╓╥ (ф©л╬╔Б║╪╔и)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "л╓цн╓нг╖╬з╪Ойл"
+
+#~ msgid "Subtree"
+#~ msgstr "╓╧╓ы╓ф╓н╔╗╔С╔х╔Й"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "л╓цн╓н╔╧╔Ё║╪╔в╪Ойл"
+
+#~ msgid "Bind DN:"
+#~ msgstr "╔п╔╓╔С╔иDN:"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "FIXME ╔п╔╓╔С╔и DN ╓н╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "FIXME ╔ш╔╧╔х╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#~ msgid "Root DN:"
+#~ msgstr "╔К║╪╔х DN:"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "FIXME ╔К║╪╔х DN ╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "FIXME ╔щ║╪╔х╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#~ msgid "Authentication:"
+#~ msgstr "г╖╬зйЩ╪╟:"
+
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "╬Е╣И LDAP ╔╙╔в╔╥╔Г╔С"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "FIXME ╔я╔╧╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "б╦╨ъ╓╥╓й╓╓╬Л╧Г╔я╔╧╓Р╨Ню╝╓╧╓К"
+
+#~ msgid ""
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
+#~ msgstr ""
+#~ "╓╒╓й╓©╓н╩Щ╓д╔╒╔и╔Л╔╧д╒╓Ра╙бР╓╥, ╓╫╓Л╓к╓д╓╓╓ф╓н╢ьо╒╓╥╓©╬ПйС╓РфЧно╓╥╓ф╓╞╓ю╓╣"
+#~ "╓╓"
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "FIXME л╬а╟╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "FIXME юБлю╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#~ msgid "Name"
+#~ msgstr "л╬а╟"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "%s ╓н╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "╪║╓╚╓Ил╬а╟╓Ра╙бР:"
+
+#~ msgid "USA"
+#~ msgstr "╔╒╔А╔Й╔╚"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
+
+#~ msgid "Transparent"
+#~ msgstr "ф╘лю"
+
+#~ msgid "Opaque"
+#~ msgstr "итф╘лю"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "й╛нЮ╓Р '╟Лхл', '╩Де╙', '╤кхК' ╓╒╓К╓╓╓о '╓й╓╥' ╓Ра╙бР╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "ф╘люеы╓о 'ф╘лю', 'итф╘лю', ╓╒╓К╓╓╓о '╓й╓╥' ╓г╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "╔╒╔И║╪╔Ю╔╕╔ё╔С╔и╔╕╓╛╦╫╓Л╓©╩Ч BEEP ╡╩╓Рлд╓И╓╧"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "╔╚╔Л╔С╔ю╓нюъдЙ"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "фЭиуаЮ╨Н╔╙╔в╔╥╔Г╔С"
+
+#~ msgid "Defaults"
+#~ msgstr "╔г╔у╔╘╔К╔х"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "╓╧╓ы╓ф╓нлСб╚╓Р╨еб╔╓╧╓К"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "й╛а╟"
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "╨О╫Э"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "╔н║╪╔х"
+
+#~ msgid "Task"
+#~ msgstr "╔©╔╧╔╞"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% ╢╟н╩(_l):"
+
+#~ msgid "Transparency"
+#~ msgstr "ф╘люеы"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓о╦╫╨ъмЬмя╫пмХ╓ч╓╩╓С"
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "╔у╔╘╔К╔ю╓г╡СиЭитг╫╓й╔╗╔И║╪╓╛х╞ю╦╓╥╓©╓Х╓╕╓г╓╧"
+
+#~ msgid "All"
+#~ msgstr "╓╧╓ы╓ф"
+
+#~ msgid "Edit"
+#~ msgstr "йт╫╦"
+
+#~ msgid "Resend"
+#~ msgstr "╨фаВ©╝"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔ч╔м║╪╔╦╔Ц"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "On %s, %s wrote:"
+
+#~ msgid "Receiving"
+#~ msgstr "╪У©╝цФ"
+
+#~ msgid "Store"
+#~ msgstr "╣╜о©"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "и╫╪╗╓╧╓К╔у╔╘╔К╔ю╓РЁ╚╩о╓╧╓К:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "\"%s\" ╓н╣╜о©╓Р╪ХфюцФ"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "My Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%Y/%B/%e %A"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "My Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓н╟У╨Ч╓к╪╨гт╓╥╓ч╓╥╓©"
+
+#~ msgid "My Evolution"
+#~ msgstr "My Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "╔Ё╔С╔©╔╞╔х(_C)"
+
+#~ msgid "Go to present time"
+#~ msgstr "╦╫╨ъ╓н╩Ч╢ж╓ь╟эф╟╓╥╓ч╓╧"
+
+#~ msgid "W_ork Week"
+#~ msgstr "╫╣╢жо╚ф╞╩Ч╢ж(_o)"
+
+#~ msgid "_Day"
+#~ msgstr "фЭ(_D)"
+
+#~ msgid "_Week"
+#~ msgstr "╫╣(_W)"
+
+#~ msgid "Close this appointment"
+#~ msgstr "╓Ё╓нлСб╚╓Рйд╓╦╓ч╓╧"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "╔в╔Й╔С╔©╓нюъдЙ"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "лСб╚╓Рйщб╦╓╥╓ф╔ю╔╓╔╒╔М╔╟╔э╔ц╔╞╔╧╓Рйд╓╦╓ч╓╧"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "ф╟╨Н(_A)"
+
+#~ msgid "Help"
+#~ msgstr "╔ь╔К╔в"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "б╬╓ь╔Ё╔С╔©╔╞╔х╓РаВ©╝(_n)..."
+
+#~ msgid "See online help"
+#~ msgstr "╔╙╔С╔И╔╓╔С╔ь╔К╔в╓Р╩╡╬х╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#~ msgid "Compose"
+#~ msgstr "╨Ню╝"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "дЙ╢Э╧ьфи╢имЩ(_S)..."
+
+#~ msgid "Show _All"
+#~ msgstr "╓╧╓ы╓фи╫╪╗(_A)"
+
+#~ msgid "Print Preview..."
+#~ msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪..."
+
+#~ msgid "_Re-send Message"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓Р╨фаВ©╝(_R)"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "╔д║╪╔К╔п║╪╓н╔╚╔╧╔©╔ч╔╓╔╨(_z)..."
+
+#~ msgid "Customize"
+#~ msgstr "╔╚╔╧╔©╔ч╔╓╔╨"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "╔д║╪╔К╔п║╪╓Р╔╚╔╧╔©╔ч╔╓╔╨╓╥╓ч╓╧"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "╓Ё╓н╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
+
+#~ msgid "Save task as something else"
+#~ msgstr "йл╓н╓Б╓н╓х╓╥╓ф╔©╔╧╔╞╓Рйщб╦╓╥╓ч╓╧"
+
+#~ msgid "Getting _Started"
+#~ msgstr "╩о╓А╓к(_S)"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "╔Ё╔С╔©╔╞╔х╔ч╔м║╪╔╦╔Ц╓Р╩х╓╕(_o)"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "╔╚╔Л╔С╔ю╓Р╩х╓╕(_C)"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "╔А║╪╔И╓Р╩х╓╕(_M)"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "лСб╚(_A) (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "╔Ё╔С╔©╔╞╔х(_C) (FIXME)"
+
+#~ msgid "_Index"
+#~ msgstr "╔╓╔С╔г╔ц╔╞╔╧(_I)"
+
+#~ msgid "_Mail message"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓Р╔А║╪╔К(_M)"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "╔©╔╧╔╞(_T) (FIXME)"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "╔А║╪╔КюъдЙ(_M)..."
+
 #, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "╔©╔╧╔╞╓нюъдЙ..."
@@ -11905,9 +14005,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ msgid "Alarms timeout after"
 #~ msgstr "╩ьдЙ╩Ч╢ж╦Е╓к╔╒╔И║╪╔Ю╓╛╔©╔╓╔Ю╔╒╔╕╔х"
 
-#~ msgid "Colors"
-#~ msgstr "╔╚╔И║╪"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "╔╒╔И║╪╔ЮдД╩ъ╓Рм╜╦З"
 
@@ -11926,9 +14023,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ msgid "Overdue Items:"
 #~ msgstr "╢Э╦б╓Р╡А╓╝╓©╔╒╔╓╔ф╔Ю:"
 
-#~ msgid "TaskPad"
-#~ msgstr "╔©╔╧╔╞╔я╔ц╔и"
-
 #~ msgid "Time Until Due"
 #~ msgstr "╢Э╦б╓ч╓г╓н╩Ч╢ж"
 
@@ -11944,9 +14038,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ msgid "Edit this task"
 #~ msgstr "╓Ё╓н╔©╔╧╔╞╓Рйт╫╦╓╥╓ч╓╧"
 
-#~ msgid "Go to Today"
-#~ msgstr "╨ёфЭ╓ь╟эф╟"
-
 #~ msgid "Delete all Occurrences"
 #~ msgstr "╓╧╓ы╓ф╓н╫пмХ╩Ж╓Р╨О╫Э"
 
@@ -12006,12 +14097,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ "х╞и╫\n"
 #~ "╔╓╔ы╔С╔х"
 
-#~ msgid "Summary contains"
-#~ msgstr "╔╣╔ч╔Й╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
-
-#~ msgid "Comment contains"
-#~ msgstr "╔Ё╔А╔С╔х╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
-
 #~ msgid "Has category"
 #~ msgstr "╪║╓н╔╚╔ф╔╢╔Й╓Р╩Щ╓д"
 
@@ -12044,7 +14129,8 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╧╓╛║╓фи╓ъ╪Х╓Й╡дг╫╓г╓о╓╒╓Й╓ч╓╩╓С"
 
 #~ msgid "That file appeared accesible but open(2) failed."
-#~ msgstr "╓╫╓н╔у╔║╔╓╔К╓о╔╒╔╞╔╩╔╧╡дг╫╓н╓Х╓╕╓к╦╚╓╗╓ч╓╧╓╛║╓open(2) ╓о╪╨гт╓╥╓ч╓╥╓©"
+#~ msgstr ""
+#~ "╓╫╓н╔у╔║╔╓╔К╓о╔╒╔╞╔╩╔╧╡дг╫╓н╓Х╓╕╓к╦╚╓╗╓ч╓╧╓╛║╓open(2) ╓о╪╨гт╓╥╓ч╓╥╓©"
 
 #~ msgid ""
 #~ "The file is very large (more than 100K).\n"
@@ -12070,9 +14156,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ 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"
@@ -12134,9 +14217,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ msgid "Factory for the RDF summary."
 #~ msgstr "RDF ╔╣╔ч╔Й╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
 
-#~ msgid "RDF Summary"
-#~ msgstr "RDF ╔╣╔ч╔Й"
-
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "╔ф╔╧╔х Bonobo ╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
 
@@ -12173,9 +14253,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "╦е╓╓╔у╔╘╔К╔ю╓Р╔Й╔м║╪╔Ю╓╥╓ф╔╙║╪╔в╔СцФ"
 
-#~ msgid "Creating new folder"
-#~ msgstr "©╥╣╛╔у╔╘╔К╔ю╓Р╨Ню╝цФ"
-
 #~ msgid "Copying messages"
 #~ msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪цФ"
 
@@ -12200,18 +14277,15 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ 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>"
+#~ "-----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>"
+#~ "-----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 "╔А╔ц╔╩║╪╔╦╓наВ©╝╪т╓ьйж©╝╓╥╓ч╓╧"
@@ -12243,9 +14317,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ msgid "Create a new calendar"
 #~ msgstr "©╥╣╛╔╚╔Л╔С╔ю╓Р╨Ню╝╓╥╓ч╓╧"
 
-#~ msgid "Day"
-#~ msgstr "фЭ"
-
 #~ msgid "New _Event"
 #~ msgstr "©╥╣╛╔╓╔ы╔С╔х(_E)"
 
@@ -12258,9 +14329,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ msgid "Save calendar as something else"
 #~ msgstr "йл╓н╓Б╓н╓х╓╥╓ф╔╚╔Л╔С╔ю╓Рйщб╦╓╥╓ч╓╧"
 
-#~ msgid "Week"
-#~ msgstr "╫╣"
-
 #~ msgid "_Open Calendar"
 #~ msgstr "╔╚╔Л╔С╔ю╓РЁ╚╓╞(_O)"
 
@@ -12276,9 +14344,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "╔╒╔и╔Л╔╧д╒(_B)... (FIXME)"
 
-#~ msgid "C_lear"
-#~ msgstr "╔╞╔Й╔╒(_l)"
-
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "л╬а╟╓н╔а╔╖╔ц╔╞ (_k) (FIXME)"
 
@@ -12315,9 +14380,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ msgid "Print S_etup..."
 #~ msgstr "╔в╔Й╔С╔©╓нюъдЙ(_e)..."
 
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "╔©╔╧╔╞мв╣А(_R) (FIXME)"
-
 #~ msgid "_About..."
 #~ msgstr "╬ПйС(_A)..."
 
@@ -12357,15 +14419,6 @@ msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #~ 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 "╓Д╓Йд╬╓╥"
 
diff --git a/po/ko.po b/po/ko.po
index 1926174eff..9bc8464140 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,10 +5,11 @@
 # update by ChiDeok Hwang <hwang@mizi.co.kr> 2001/03/12
 # update by ChiDeok Hwang <hwang@mizi.co.kr> 2001/03/15
 # update by ChiDeok Hwang <hwang@mizi.co.kr> 2001/03/23
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -26,11 +27,11 @@ msgstr "GnomeCard фдюою╩ Evolutionю╦╥н ╟║а╝©и╢о╢ы"
 msgid "Imports VCard files into Evolution."
 msgstr "GnomeCard фдюою╩ Evolutionю╦╥н ╟║а╝©и╢о╢ы"
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "д╚╣Е: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -38,37 +39,37 @@ msgstr ""
 "\n"
 "юл╦╖: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -76,7 +77,7 @@ msgstr ""
 "\n"
 "╩Щюо: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -84,25 +85,25 @@ msgstr ""
 "\n"
 "аж╪р:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -110,7 +111,7 @@ msgstr ""
 "\n"
 "  ╫ц/╣╣:          "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -118,7 +119,7 @@ msgstr ""
 "\n"
 "  аЖ©╙:        "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -126,7 +127,7 @@ msgstr ""
 "\n"
 "  ©ЛфМ ╧Ьхё:   "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -134,13 +135,13 @@ msgstr ""
 "\n"
 "  ╠╧╟║:        "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -148,7 +149,7 @@ msgstr ""
 "\n"
 "юЭх╜╧Ьхё:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -156,7 +157,7 @@ msgstr ""
 "\n"
 "юЭх╜╧Ьхё:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -164,7 +165,7 @@ msgstr ""
 "\n"
 "юЭюз©ЛфМ:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -172,13 +173,13 @@ msgstr ""
 "\n"
 "юЭюз©ЛфМ:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -186,7 +187,7 @@ msgstr ""
 "\n"
 "╫ц╟ё╢К: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -194,7 +195,7 @@ msgstr ""
 "\n"
 "аЖ╦╝юШ ю╖д║: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -202,7 +203,7 @@ msgstr ""
 "\n"
 "аВюЕ аВгт: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -210,7 +211,7 @@ msgstr ""
 "\n"
 "╠Б╟Э: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -218,31 +219,31 @@ msgstr ""
 "\n"
 "  юл╦╖:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -250,7 +251,7 @@ msgstr ""
 "\n"
 "╦Я╥о: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -268,13 +269,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -295,8 +296,8 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -311,20 +312,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -373,201 +374,207 @@ msgstr ""
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "©╛╤ТцЁ(_C)"
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "Folder containing contact information"
 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-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "╩У ©╛╤ТцЁ"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "╩У ©╛╤ТцЁ"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "╩У ©╛╤ТцЁ"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "╩У ©╛╤ТцЁ"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "аж╪р╥о фМаЩ"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "╟Ха╓"
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
+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.glade.h:4
+msgid "Addressbook Sources"
+msgstr "аж╪р╥о ╪р╫╨"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "хё╫╨ф╝:"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Advanced"
+msgstr "╟М╠ч"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
 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."
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+msgid "Basic"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "фВф╝:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "╩Ха╕"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 msgstr "╟к╩Ж ╧Эю╖:"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "юнаУ:"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "╟к╩Ж ╧Эю╖:"
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "╪╜╧Ж а╬╥Ы::"
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
-msgstr "╟Ф╥н:"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "юо"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 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.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "аж╪р╥о ╪р╫╨"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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 ""
+msgid "_Account name:"
+msgstr "╟Ха╓ ╟Э╦╝"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "╪Жа╓(_E)"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "╪╜╧Ж╟║ юнаУю╩ ©Д╠╦гу╢о╢ы"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "фВф╝:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "╪╜╧Ж а╬╥Ы::"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "╢ы╦╔ ©╛╤ТцЁ"
 
-#: addressbook/gui/component/addressbook.c:345
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
-msgid "Enter password for %s"
+msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "юнаУ:"
+
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "юЭюз©ЛфМ аж╪р:"
+
+#: addressbook/gui/component/addressbook.c:418
+msgid "Password:"
+msgstr "╨Я╧п╧Ьхё:"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "аж╪р╥ою╩ ©╜╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -575,48 +582,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
+msgid "Category is"
 msgstr "╦Я╥о"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "╟М╠ч..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "╦Я╥о:"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "фЗ╢У е╫╩Ж╠Б╟║ г╔╫цгр URI"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(юл╦╖ ╬Ью╫)"
+
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "юл╦чюо 3"
 
@@ -640,19 +672,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "аж╪р╥о фМаЩ"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "©╛╤ТцЁ а╓╨╦ фМаЩ"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "©╛╤ТцЁ©║ цъ╟║"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "юЭюз©ЛфМ аж╪р:"
@@ -674,13 +706,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "а╕╟е"
 
@@ -693,37 +722,56 @@ msgstr "юЭ╨н а╕╟е"
 msgid "Send HTML Mail?"
 msgstr "юл╦чюо ╨╦Ё╩╠Б"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "╢ы╦╔ ©╛╤ТцЁ"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "╧ч╢б╩Г╤В ╦Я╥о"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "фВгт"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "╪╠ецгя юл╦╖"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "©╛╤ТцЁ(_C)"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "юл╦╖ю╩ ╪╠ецгр ╟В:"
+msgid "F_ind"
+msgstr "цё╠Б"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "╪╠ецгя юл╦╖"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, 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/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "фЗ╢У(_F)"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -738,8 +786,8 @@ msgid "Business _Fax"
 msgstr "аВюЕ фя╫╨(_F)"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "╦Я╥о(_t)..."
 
@@ -748,16 +796,16 @@ msgid "Contact Editor"
 msgstr "©╛╤ТцЁ фМаЩ╠Б"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "юз╪╪хВ"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "фдюо╥н юЗюЕ:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "юо╧щ а╓╨╦"
 
@@ -782,239 +830,1227 @@ msgstr "юЭх╜ гЭеб"
 msgid "Wants to receive _HTML mail"
 msgstr "HTMLгЭ╫д фМаЖ ╩Г©К(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "х╗фДюлаЖ аж╪р:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "аж╪р(_A)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "а╤╪Ж юл╦╖(_A):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "╩Щюо(_B):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "аВюЕ(_B)"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "©╛╤ТцЁ(_C)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "╩Ха╕(_D)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "╨н╪╜(_D):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "юЭц╪ юл╦╖(_F)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "аЩ(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "аВгт(_J):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "╦е╢оюЗ юл╦╖(_M):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "хч╢КюЭх╜(_M)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "╨╟╦М(_N):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "╩Г╧╚╫г(_O):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "аВ╬В(_P):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "╧Х©Люз(_S):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "юл╟мю╨ юЭюз©ЛфМ аж╪рют╢о╢ы(_T)"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "х╗фДюлаЖ аж╪р:"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "а╤╪Ж"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "аВюЕ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "аВюЕ 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "аВюЕ фя╫╨"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "юз╣©бВ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "х╦╩Г"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "аЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "аЩ 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "аЩ фя╫╨"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "хч╢КюЭх╜"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "╠Бе╦"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "╠Бе╦ фя╫╨"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "╩ъ╩ъ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "`%s'©║юж╢б фЗ╢У╦╕ ©╜╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "©╛╤ТцЁ Quick цъ╟║"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "а╓╫д юл╦╖ фМаЩ"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "а╓╫д юл╦╖"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "юл╦чюо"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "аж╪р _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "а╤╪Ж"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "юз╣©"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "╧ФгБ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+msgid "Austria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "©╛╣╣"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "е╘╠Б"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "╨╦Ё╩╢б аъ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "фМаЖ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "дЁЁ╙╢ы"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "акюЕ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "аж╪р х╝юн"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "фдюо"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "акюЕ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "╩Ж╩С"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "╨╧╩Гаъ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "╠╧╟║(_y):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "ги╤У╣Е"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "╧л╠╧"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "цК╪р╣й"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "аж"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "ги╤У╣Е"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "дЁЁ╙╢ы"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "©ююЭ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "юо╧щ а╓╨╦"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "фМаЖ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "╫ц"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "юо©Дюо"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "юл╦╖(_L):"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+msgid "Lesotho"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+msgid "Liberia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "╩О©Ы"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "фМаЖ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "фМаЖ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "фМаЖ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "©╘╧И"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "©ю©Ы"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "©Ы©Дюо"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "хч╢КюЭх╜"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+msgid "Myanmar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "╩У фМаЖ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "╠ше╦╥║ ╪╠ец(_T)"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "╩У ©╛╤ТцЁ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "╩У фМаЖ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "╩ъ╩ъ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+msgid "Nigeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "╨п"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "гЖюГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "╨ыюл╠Б"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "дЁЁ╙╢ы"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "а╬юл"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "ги╤У╣Е"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "╪╪╥н"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+msgid "Qatar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "╪╫╪г:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "дЁЁ╙╢ы"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+msgid "Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "юо╧щ а╓╨╦"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+msgid "Seychelles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "╨╦еК"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "╨╦Ё©"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "юо"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "╨╟╦М"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "ги╤У╣Е"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "╨╦Ё╫юл"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+msgid "Taiwan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "юш╬В"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "ги╤У╣Е"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "╧ч╢б╩Г╤В"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "©ю╢ц"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "х╜"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+msgid "Turkmenistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "дЁЁ╙╢ы"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "╦ч╪╪аЖ юн╪Б"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "╪╠ецгя юл╦╖"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+msgid "Yemen"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "аж╪р(_A):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "╫ц(_C):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr ""
 
@@ -1105,6 +2141,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "а╕╟е"
@@ -1115,7 +2152,7 @@ msgid "contact-list-editor"
 msgstr "©╛╤ТцЁ фМаЩ╠Б"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "©╛╤ТцЁ фМаЩ╠Б"
@@ -1125,7 +2162,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1147,25 +2184,31 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "╢ы╦╔ ©╛╤ТцЁ"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "╢ы╦╔ ©╛╤ТцЁ"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "╟М╠ч ╟к╩Ж"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "╟к╩Ж"
 
@@ -1277,44 +2320,53 @@ msgstr ""
 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 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:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "©╜╠Б"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "╢ы╦╔ аж╪р╥н юЭ╢ч"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
-msgid "Send message to contact"
+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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "юн╪Б"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "╩Ха╕"
 
@@ -1330,7 +2382,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "╬к ╪Ж╬Ь╢б ©║╥╞"
 
@@ -1339,7 +2392,7 @@ msgstr "╬к ╪Ж╬Ь╢б ©║╥╞"
 msgid "Repository offline"
 msgstr "©юга╤Сюн©║╪╜ юш╬В"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "гЦ╟║╠г ╟е╨н"
 
@@ -1358,8 +2411,11 @@ msgid "Protocol not supported"
 msgstr "юш╣©юл аЖ©Ь╣гаЖ ╬йю╫"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "цК╪р╣й"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1388,148 +2444,148 @@ msgid "Error removing list"
 msgstr "%sю╩(╦╕) юп╢баъ ©ю╥Ы ╧ъ╩Щ"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
 "юз╥Аю╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ:\n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* ©╛╤ТцЁ©║ цъ╟║го╠Б *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 #, fuzzy
 msgid "File As"
 msgstr "фдюо╥н юЗюЕ:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "юл╦чюо"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 #, fuzzy
 msgid "Primary Phone"
 msgstr "юл╦чюо"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "а╤╪Ж"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 #, fuzzy
 msgid "Business Phone"
 msgstr "аВюЕ 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "х╦╩Г"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 #, fuzzy
 msgid "Home Phone"
 msgstr "аЩ 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "а╤аВ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 #, fuzzy
 msgid "Business Address"
 msgstr "аВюЕ 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 #, fuzzy
 msgid "Home Address"
 msgstr "аж╪р х╝юн"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "хч╢КюЭх╜"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "аВюЕ 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "аЩ 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Other Phone"
 msgstr "╢ы╦╔ ©╛╤ТцЁ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Other Address"
 msgstr "аж╪р х╝юн"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "ю╔ ╩Гюлф╝"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "╨н╪╜"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "╩Г╧╚╫г"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "а╕╦Я"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "аВ╬В"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "╨╟╦М"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "╧Х©Люз"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "ЁКф╝"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "©о╥А"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "╢ч╥б ╨р╥╞©ю╠Б..."
@@ -1721,6 +2777,23 @@ msgstr "фЬ:"
 msgid "_Font..."
 msgstr "╠ш╡ц..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "╢ч╥б юн╪Бго╠Б"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "╢ч╥б юн╪Бго╠Б"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "╨юеУ юн╪Б(_v)..."
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1874,7 +2947,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "╠вЁПю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Bonobo╦╕ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
@@ -1883,147 +2956,138 @@ msgstr "Bonobo╦╕ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
 msgid "Could not create the alarm notify service factory"
 msgstr "╬к╤В ╠Б╢и фяеД╦╝╦╕ ╦╦╣И╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
+#: calendar/gui/calendar-commands.c:435
+#, c-format
+msgid "%d"
 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"
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%Y/%m/%d"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:586
+#: calendar/gui/calendar-commands.c:604
 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/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr ""
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr ""
 
-#: 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"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "╨о"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "Ё╡"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "╣©"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "╪╜"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "ЁТюл"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "╨╦еК"
 
-#: 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Ё╥╟т"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "аж"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "╧ы╩щ"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "╫цюш ╬хгт"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "©о╥А╣й"
 
-#: 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2031,69 +3095,56 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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 ""
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "а╓юг╬х╣й"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "╧щ╨╧╣й"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "©╧"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "╬ф╢о©ю"
 
@@ -2116,29 +3167,88 @@ msgstr "аж"
 msgid "Month View"
 msgstr "╢ч"
 
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Summary contains"
+msgstr "╦Я╥о"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "╪Ё╦М:"
+
+#: calendar/gui/cal-search-bar.c:58
+#, fuzzy
+msgid "Comment contains"
+msgstr "фВгтгоаЖ╬йю╫"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "╢ч╥б"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "юш╬В"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "╦чюо╦╣ ╦╝╫╨ф╝©║╢Кгя гйем"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "╩У╥н©Н ╬Ю╪с╦╕ ╦╦╣Г╢ы"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "╩У ╬Ю╪с"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr ""
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "юш╬В"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "╢ч╥бюл г╔╫цгр URI"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "╧ч╢б╩Г╤В ╦Я╥о"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "╨╦╠Б ©и╪г"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2190,120 +3300,126 @@ msgstr "╫ц"
 msgid "minutes"
 msgstr "╨п"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d Ё╞╬©"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr "го╥Г╬©"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d аж╬©"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr " гяаж╬©"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d ╫ц╟ё╬©"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr " гя╫ц╟ё╬©"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d ╨п╦╤╢ы"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr "юо╨п╦╤╢ы"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d цй╦╤╢ы"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " 1 цй╦╤╢ы"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "га╥н╠в╥╔ю╩ ╠╦╣©гу╢о╢ы"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "╬Ю╪с╫цюшюЭ"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "╬Ю╪с ╫цюшхд"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "╬Ю╪с Ё║Ё╙╠БюЭ"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "©Д╬Ю"
 
@@ -2312,12 +3428,11 @@ msgstr "©Д╬Ю"
 msgid "_Options..."
 msgstr "╪Ёа╓(_O)"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr ""
 
@@ -2334,7 +3449,7 @@ msgstr "╬Ю╪с Ё║"
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "╨п"
 
@@ -2351,200 +3466,225 @@ msgid "10 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
+msgid "15 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
+msgid "30 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
+msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr ""
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "╦чюо ╪Ёа╓(_M)..."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
+msgid "Color for overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
+msgid "Color for tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-msgid "Calendar"
-msgstr "╢ч╥б"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "╩У╥н©Н ╬Ю╪с╦╕ ╦╦╣Г╢ы"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "╢ч╥б ╪Ёа╓"
+#, fuzzy
+msgid "Days"
+msgstr "╢Е╩У╬©"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "юоажюоюг ц╧б╟Ё╞:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "╠щ©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+#, fuzzy
+msgid "Hours"
+msgstr "╫ц"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
-msgstr ""
+#, fuzzy
+msgid "Minutes"
+msgstr "╨п"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "©Ы©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
+msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "г╔╫ц"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "еД©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "го╥Гюг Ё║:"
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "╬Ю╪с Ё║╫ц╟ё ╨╦╠Б"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "юоажюоюг ц╧б╟Ё╞:"
+msgid "Show week _numbers in date navigator"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "╠щ"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "╫цюш Ё╞б╔(_r):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "╠щ©Дюо"
+#, fuzzy
+msgid "Su_n"
+msgstr "юо"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "юо©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "©Ы"
+#, fuzzy
+msgid "T_hu"
+msgstr "╦Я"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "©Ы©Дюо"
+#, fuzzy
+msgid "T_ue"
+msgstr "х╜"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
+msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "╦Я©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "╦П╣Г ╬Ю╪сю╩ ╩С╠Б╫це╟╠Б"
+#, fuzzy
+msgid "Time"
+msgstr "а╕╦Я"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"╫ц╟ё╢К: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "еД"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "е╘╠Б:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "еД©Дюо"
+msgid "Time format:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#, fuzzy
-msgid "Show appointment end times in week and month views"
-msgstr "╬Ю╪с Ё║╫ц╟ё ╨╦╠Б"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "х╜©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "╪Ж©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr ""
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "аж"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "юо"
+msgid "_12 hour (AM/PM)"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "юо©Дюо"
+#, fuzzy
+msgid "_24 hour"
+msgstr " гя╫ц╟ё╬©"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "юш╬В"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "╦Я"
+#, fuzzy
+msgid "_Display"
+msgstr "г╔╫ц"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "╦Я©Дюо"
+#, fuzzy
+msgid "_End of day:"
+msgstr "го╥Гюг Ё║:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "а╕╦Я"
+msgid "_Fri"
+msgstr "╠щ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr ""
+#, fuzzy
+msgid "_General"
+msgstr "юо╧щ а╓╨╦"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr ""
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "╩Ха╕╣х ╦ч╪╪аЖ ╪Ш╠Х(_D)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"╫ц╟ё╢К: "
+msgid "_Mon"
+msgstr "©Ы"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "х╜"
+#, fuzzy
+msgid "_Other"
+msgstr "╠Бе╦"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "х╜©Дюо"
+#, fuzzy
+msgid "_Sat"
+msgstr "еД"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "╪Ж"
+#, fuzzy
+msgid "_Task List"
+msgstr "юш╬В"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "╪Ж©Дюо"
+#, fuzzy
+msgid "_Wed"
+msgstr "╪Ж"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
-msgid "Work Week"
-msgstr "аж"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr ""
+msgid "before the start of the appointment"
+msgstr "╬Ю╪с╫цюшюЭ"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2609,74 +3749,69 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "╬Ю╪сю╩ ╪Жа╓гя╢ы"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "╬Ю╪с - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "©╘гЮ юоа╓ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2722,44 +3857,35 @@ msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "а╓╦╩╥н ©╘гЮюоа╓ `%s'ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "фдюою╩ ╟М╦ё╪╪©Д"
+msgid "Addressbook..."
+msgstr "аж╪р╥о цъ╟║"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "╪╫╪г:"
+msgid "Delegate To:"
+msgstr "╩Ха╕╣й"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-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 ""
+msgid "Enter Delegate"
+msgstr "╩Ха╕╣й"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "╬Ю╪с"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "╧лфц цК╪р"
@@ -2768,173 +3894,188 @@ msgstr "╧лфц цК╪р"
 msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "╧ы╩щ"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "╨п╥Ы"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+msgid "Con_fidential"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Date & Time"
 msgstr "╨╦Ё╫ Ё╞б╔"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "аж"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "╟Ь©К е╟(_b)"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "╨╦╠Б"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "©Д╬Ю(_u):"
 
-#: 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
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "Ё║╦╤д║╢б ╫ц╟ё(_E):"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "╫цюш ╫ц╟ё(_S):"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "гй бЭ╪╝юз"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "юАа╓юШ"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "╩Ха╕╣й"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "аЬгЮаъ"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "гй бЭ╪╝юз"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "гй бЭ╪╝юз"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "гй бЭ╪╝юз"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 msgid "Sent By:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "╩Ха╕..."
@@ -2976,19 +4117,18 @@ msgid "Role"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "а╤аВ:"
@@ -3033,13 +4173,14 @@ msgstr ""
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "A_dd"
+msgstr "цъ╟║"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3050,26 +4191,30 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
+msgid "_Custom recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "╪Жа╓"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "_No recurrence"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Simple recurrence"
+msgstr ""
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -3111,167 +4256,163 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% ©о╥А(_p):"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "╩Ха╕╣й"
+msgid "Date Completed:"
+msgstr "©о╥А╣х Ё╞б╔:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "(юл╦╖ ╬Ью╫)"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "аЬгЮаъ"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "юш╬В"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "©Л╪╠╪Ью╖(_P):"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% ©о╥А(_p):"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "╩Себ(_S):"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "аЬгЮаъ"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "©╧╬Ю╣й"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "╪Ё╦М:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "╫цюш Ё╞б╔(_r):"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
-msgid "_Due Date:"
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "©Л╪╠╪Ью╖(_P):"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "╩Себ(_S):"
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "_Due Date:"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 #, fuzzy
 msgid "_Open"
 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "╨╧╩Г(_C)"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "╨ыюл╠Б(_P)"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "©о╥А г╔╫ц"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "©о╥А г╔╫ц"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 msgstr "юш╬В╦Я╥о©║ цъ╟║го╠Б"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, fuzzy, no-c-format
-msgid "% Complete"
-msgstr "% ©о╥А(_p):"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
@@ -3306,23 +4447,23 @@ msgstr "аЖ╦╝гпюШ ю╖д║"
 msgid "Priority"
 msgstr "©Л╪╠╪Ью╖"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "╫цюшгя Ё╞"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "©Д╬Ю"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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 ""
@@ -3334,151 +4475,257 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "©ю╢ц╥н юл╣©(_T)"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Ё╞б╔╥н юл╣©..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "юл ╬Ю╪сю╩ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "гЖюГ фдюою╩ юЗюЕ"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "юл ╦ч╪╪аЖ╦╕ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "юл╟мю╨ юЭюз©ЛфМ аж╪рют╢о╢ы(_T)"
+msgid "Meeting Information"
+msgstr "а╓╨╦ ╬Ью╫"
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "╧лфц цК╪р"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "х╦юг а╬╥А ╫ц╟ё(_e):"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "юл╟мю╨ юЭюз©ЛфМ аж╪рют╢о╢ы(_T)"
+
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "╧лфц цК╪р"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "фдюою╩ ╟М╦ё╪╪©Д"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "юл ╦ч╫цаЖ╢б гЖюГ ╨╦©╘аы ╪Ж╟║ ╬Ь╫ю╢о╢ы"
+msgid "Bad Meeting Message"
+msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё©"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "а╓╨╦"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "юш╬Вфп╣Е"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "юш╬В"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "х╦╫е"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:691
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "╧лфц цК╪р"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё©"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "╩Г©Кюз а╓╨╦"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "╩Г©Кюз а╓╨╦"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "╦ч╪╪аЖ юн╪Б"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "©о╥А╣х Ё╞б╔:"
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% ©о╥А(_p):"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "╨╦Ё╫ Ё╞б╔"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3517,44 +4764,27 @@ msgstr ""
 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
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, 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/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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "╩У ╬Ю╪с..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'©║юж╢б фЗ╢У╦╕ ©╜╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3580,43 +4810,43 @@ 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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "╩О©Ы"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "©ю©Ы"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "╫ц©Ы"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "╠╦©Ы"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "©ю╢ц╥н юл╣©"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3772,12 +5002,6 @@ msgstr ""
 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:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3811,9 +5035,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "юн╪Б ╧л╦╝╨╦╠Б"
 
@@ -3826,7 +5049,7 @@ msgstr "юл гв╦Яю╩ юн╪Б"
 msgid "Print Setup"
 msgstr "юн╪Б ╪Ёа╓"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "г╔╫цгр юш╬В фЗ╢Уюг URI URI"
 
@@ -3862,6 +5085,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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"
@@ -3927,7 +5246,7 @@ msgid "Unable to process spool folder"
 msgstr "аж╪р╥ою╩ ©╜╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
 #: camel/camel-filter-driver.c:667
-#, fuzzy
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "╦ч╪╪аЖ %s╦╕ ╟║а╝©ю╠Б"
 
@@ -3968,7 +5287,7 @@ msgstr "гйем ╨п╪╝аъ ©ю╥Ы: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "гйем ╫ггЮаъ ©ю╥Ы: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "гйем цё╠Б ╫ггЮаъ ©ю╥Ы: %s: %s"
@@ -3993,12 +5312,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -4112,13 +5431,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -4136,15 +5455,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr "юс╫ц фдюою╩ ╦╦╣И╪Ж ╬Ью╫: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "╪Ж╫еюз╟║ аЖа╓╣гаЖ╬йю╫"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4178,7 +5497,7 @@ msgid "Connection cancelled"
 msgstr "©╛╟Аюл цК╪р╣й"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4189,7 +5508,7 @@ msgstr "(╦П╦ё╢б хё╫╨ф╝)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "юш╬В цК╪р"
 
@@ -4307,42 +5626,68 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "юнаУ ╫гфп."
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "╨Я╧п╧Ьхё"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+msgid "POP Source URI"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4355,12 +5700,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4407,7 +5752,7 @@ msgstr "╦ч╪╪аЖ©║ фдюою╩ ц╥╨нгу╢о╢ы"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4415,7 +5760,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4459,61 +5804,61 @@ msgstr ""
 "╦ч╪╪аЖ╦╕ ╬Рю╩╪Ж ╬Ью╫: %2$s фЗ╢У©║╪╜ %1$s\n"
 "  %3$s"
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP server╥н╨нем ©╧╩Сд║╦Ьгя ╢Д╨╞: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ╦М╥июл ╫гфп: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "╪╜╧Жюг ╢Д╨╞юл Ёй╧╚ юобО Ё║Ё╣╫ю╢о╢ы."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ╪╜╧Жюг ╢Д╨╞©║ %s а╓╨╦╟║ ╢Ц╟эюжаЖ╬й╫ю╢о╢ы"
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ╪╜╧Ж╥н╨нем ©╧╟ъд║╦Ьгя OK╢Д╨╞юл ©х: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "╦ч╫цаЖ╣Ию╩ юЗюЕ"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "╦ч╫цаЖ╣Ию╩ юЗюЕ"
@@ -4529,7 +5874,7 @@ msgstr ""
 "%s ╣П╥╨еД╦╝╦╕ ╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "╩У фМаЖ╦╕ юш╪╨гу╢о╢ы"
@@ -4539,7 +5884,7 @@ msgstr "╩У фМаЖ╦╕ юш╪╨гу╢о╢ы"
 msgid "Check for new messages in all folders"
 msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н ╨╧╩Ггу╢о╢ы"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "фЗ╢У"
 
@@ -4578,7 +5923,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s е╦ют юнаУю╩ аЖ©Ь ╬хгт"
@@ -4589,7 +5934,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -4601,12 +5946,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "%s╟╟ю╨ фЗ╢У╟║ ╬Ью╫"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4696,7 +6041,7 @@ msgstr "╦чюофЗ╢У©║ ╦ч╪╪аЖ╦╕ ╣║╨ыюо╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4710,7 +6055,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4781,20 +6126,20 @@ msgstr "╦чюофЗ╢У©║ ╦ч╪╪аЖ╦╕ ╣║╨ыюо╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
 msgid "Cannot create folder lock on %s: %s"
 msgstr "фЗ╢У╦╕ ╬Рю╩╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: 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:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: 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-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4806,12 +6151,12 @@ msgstr ""
 "╦ч╪╪аЖ╦╕ ╬Рю╩╪Ж ╬Ью╫: %2$s фЗ╢У©║╪╜ %1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
@@ -4853,13 +6198,14 @@ msgstr ""
 #. 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"
+#, fuzzy
+msgid "Summarizing 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"
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4869,25 +6215,25 @@ 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 ""
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
+msgstr "фЗ╢У╦╕ ╬Рю╩╪Ж ╬Ь╫ю╢о╢ы: %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:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr ""
+"╪╜╦М фдюо %sю╩ ©╜ ╪Ж╟║ ╬Ь╫ю╢о╢ы:\n"
+"%s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -4991,6 +6337,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5079,39 +6436,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "POP ©Д╬Юю╩ ╟║а╝©х"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё╬╪Ж ╬Ью╫: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: 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:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё╬╪Ж ╬Ью╫: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "POP ╦ч╪╪аЖ %d╦╕ ╟║а╝©х"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 #, fuzzy
 msgid "Message storage"
@@ -5127,7 +6484,7 @@ msgstr "╪╜╧Ж©║ ╦чюо Ё╡╠Б╠Б"
 msgid "Delete after %s day(s)"
 msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr ""
 
@@ -5206,7 +6563,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr ""
 
@@ -5258,7 +6615,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmailю╩ еКгя ╦чюо юЭ╢ч"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
@@ -5266,122 +6623,122 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "╣╣©Р╦╩"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "юнаУюл гй©Дгт"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "%s е╦ют юнаУю╩ аЖ©Ь ╬хгт"
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5389,126 +6746,126 @@ msgid ""
 "\n"
 msgstr "KPOP ╪╜╧Ж©║╪╜ юнаУгр╪Ж ╬Ью╫: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ╪╜╧Ж %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "юнаУ:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5538,7 +6895,7 @@ msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "ц╥╨н"
 
@@ -5571,52 +6928,52 @@ msgstr "MIME гЭ╫д:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "аж╪р╥о"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "╨╦Ё╫ ╩Г╤В:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "х╦╫е аж╪р:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "а╕╦Я:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "╧ч╢б ╩Г╤В:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "╦ч╪╪аЖ╦╕ ╧чю╩ ╩Г╤Вю╩ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "бЭа╤:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "╦ч╪╪аЖюг ╩Г╨╩ю╩ ╧чю╩ ╩Г╤Вюг аж╪р╦╕ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "╪Шю╨ бЭа╤:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5643,45 +7000,45 @@ msgid ""
 "%s"
 msgstr "фдюою╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "╟Ф╟М"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "фдюо юЗюЕаъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "фдюою╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "фдюо юЗюЕаъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5690,7 +7047,7 @@ msgstr ""
 "цБ╥бфдюою╩ ╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5699,7 +7056,7 @@ msgstr ""
 "цБ╥бфдюою╩ ╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5708,13 +7065,13 @@ msgstr ""
 "%s╥н ╦ч╫цаЖ юЗюЕаъ ©ю╥Ы ╧ъ╩Щ:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5724,25 +7081,25 @@ msgstr ""
 "\n"
 "╨╞╟Ф╣х Ё╩©Кю╩ юЗюЕго╫ц╟з╫ю╢о╠Н?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "фдюо ©╜╠Б"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "еь╫╨ф╝ фдюо ╩Пют"
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "╦чюо ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "╦ч╫цаЖ юш╪╨ ц╒ю╩ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
@@ -5773,57 +7130,103 @@ msgstr "аж╪р _2:"
 msgid "calendar information"
 msgstr "╩Г©Кюз а╓╨╦"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "фВгт"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "фВгтгоаЖ╬йю╫"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "фВгтгоаЖ╬йю╫"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "╧ч╢б ╩Г╤В"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "фВгт"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "фВгт"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr ""
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%Y/%m/%d"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5831,13 +7234,13 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:303
+#: e-util/e-time-utils.c:313
 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
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %Y/%m/%d %I:%M %p"
 
@@ -5927,7 +7330,7 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "гЖюГ"
 
@@ -5939,11 +7342,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<Ё╞б╔╦╕ ╪╠ецгр╥а╦И ©╘╠Ф ╢╘╦ё╪╪©Д>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "╟е╦ё╟Ё ╠тд╒"
 
@@ -5964,20 +7371,20 @@ msgstr ""
 "ба, фЗ╢У ╟М╦ё╢б ╟мю╩ юью╦╪лЁв©Д.\n"
 "╣з╥н ╣╧╬ф╟║ ╦чюою╩ ╧Х╢чгр фЗ╢У╦╕ аЖа╓го╪╪©Д."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "фЗ╢У ╪╠ец"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "фЗ╢У URI╦╕ аЖа╓го╪╪©Д"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<фЗ╢У╦╕ ╟М╦╕╥а╦И ©╘╠Ф ╢╘╦ё╪╪©Д>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5998,64 +7405,53 @@ msgstr "╠тд╒ юл╦╖: "
 msgid "Untitled"
 msgstr "а╕╦Я╬Ью╫"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "а╤╟г ╪╠ец"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "╣©юш ╪╠ец"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "╦П╣Г а╤╟гюл ╢ы цФа╥╣и ╤╖"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "╬Н╤╡ а╤╟гюл╤С╣╣ цФа╥╣и ╤╖"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "а╤╟г цъ╟║"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 #, fuzzy
 msgid "incoming"
 msgstr "╣И╬Н©ю╢б╟е"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 #, 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "╟е╦ё╟т фМаЩ"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "╟║╩СфЗ╢У фМаЩ"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "╣И╬Н©ю╢б╟е"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Ё╙╟║╢б╟е"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "╟║╩С фЗ╢У"
 
@@ -6079,194 +7475,195 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "©╧╬Ю╣й"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "ц╥╨н"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "фВгт"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "фЗ╢У╥н ╨╧╩Г"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "╧чю╨ Ё╞б╔"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "╨╦Ё╫ Ё╞б╔"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "╩Ха╕╣й"
 
-#: 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
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "а╦юГгоаЖ ╬йю╫"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "цй╟М"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "г╔гЖ"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "аъ©Д"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "╦ч╪╪аЖ ╦с╦╝╦╩"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "╦ч╪╪аЖ╦╕ ╧ч╬р╫ю╢о╢ы"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "╦ч╪╪аЖ╦╕ ╨╦Ёб╫ю╢о╢ы"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "фЗ╢У╥н юл╣©"
 
-#: 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
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "юпю╫"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "╧ч╢б ╩Г╤В"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "х╦╫е"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "╨╦Ё╫юл"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "╩Себ ╪Ёа╓"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "е╘╠Б"
 
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "Source Account"
+msgstr "╟Ха╓"
+
+#: filter/libfilter-i18n.h:30
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:32
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "а╕╦Я"
+
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "фВгт"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "фВгтгоаЖ╬йю╫"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "а╦юГгоаЖ ╬йю╫"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr ""
+
 #: filter/libfilter-i18n.h:45
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "Source Account"
-msgstr "╟Ха╓"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "starts with"
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:50
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
-#: mail/message-list.etspec.h:9
-msgid "Subject"
-msgstr "а╕╦Я"
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:52
 msgid "was after"
@@ -6299,14 +7696,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "фМаЖ"
 
@@ -6332,12 +7728,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "╪Ёа╓..."
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6391,175 +7787,196 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr "╦чюо ╪Ёа╓"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "╦чюо╦╣ ╦╝╫╨ф╝©║╢Кгя гйем"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "╪Ёа╓(_P)..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr ""
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "фМаЖ ╦ч╪╪аЖ(_M)"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "фМаЖ ╦ч╪╪аЖ(_M)"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"©║╢Кгя ╪Ёа╓"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "╪Ёа╓"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "╦ч╫цаЖ╥н╨нем ╟е╦ё╟т ╩Щ╪╨(_C)"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "а╕╦Я©║╣Ш╦╔ ╟║╩СфЗ╢У(_S)"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "╧ъ╪шюз©║╣Ш╦╔ ╟║╩СфЗ╢У(_n)"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "╪Ж╫еюз©║╣Ш╦╔ ╟║╩СфЗ╢У(_R)"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "╦чюо╦╣ ╦╝╫╨ф╝©║╢Кгя гйем"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "а╕╦Я©║╢Кгя ╟е╦ё╟т(_S)"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "╧ъ╪шюн©║╢Кгя ╟е╦ё╟т(_n)"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "╪Ж╫еюн©║╢Кгя ╟е╦ё╟т(_R)"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "╦чюо╦╣ ╦╝╫╨ф╝©║╢Кгя гйем"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "╢ы╫ц ╨╦Ё©"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ(_S)..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "юн╪Б(_P)"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "╨╦Ё╫ ╩Г╤В©║╟т х╦╫е"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "юЭц╪ х╦╫е(_A)"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "юЭц╪ х╦╫е(_A)"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "юЭ╢ч(_F)"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "юпю╨ ╟мю╦╥н г╔╫ц(_k)"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "юпаЖ ╬йю╨ ╟мю╦╥н г╔╫ц(_n)"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "аъ©Д"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "юпаЖ ╬йю╨ ╟мю╦╥н г╔╫ц"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "фЗ╢У╥н юл╣©(_M)..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "фЗ╢У╥н ╨╧╩Г(_C)..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "╣г╩Л╦╡(_U)"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "аж╪р╥о цъ╟║"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "╟е╦ё╟Ё юШ©К"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "╦ч╫цаЖ╥н╨нем ╟е╦ё╟т ╩Щ╪╨(_C)"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "╦чюо╦╣ ╦╝╫╨ф╝©║╢Кгя гйем"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "а╓╨╦ ╬Ью╫"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6621,16 +8038,16 @@ msgid "Evolution News Editor"
 msgstr "Evolution ╪Ёд║"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "╪╜╦М:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6641,40 +8058,45 @@ msgstr ""
 "\n"
 "╨╞╟Ф╣х Ё╩©Кю╩ юЗюЕго╫ц╟з╫ю╢о╠Н?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr ""
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "а╓╦╩╥н юл ╟Ха╓ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "╣г╩Л╦╡"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "╠Б╨╩ ╟Ха╓ю╦╥н го╠Б"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 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-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "╦чюо ╪Ёа╓(_M)..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6720,17 +8142,17 @@ msgid ""
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6738,198 +8160,227 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 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:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "╦ч╪╪аЖ╦╕ ╧ч╬р╫ю╢о╢ы"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "╢ы╦╔юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "╢ы╦╔юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "╟Ф╟М"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╫ц ╨╪ ╪Ж ╬Ь╫ю╢о╢ы"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "фМаЖ ╟е╦ё╟Ё(_F)..."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "╦ч╪╪аЖ юн╪Баъ ╫гфп"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "а╓╦╩╥н юл ╩У ╟Ха╓ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Evolution ╟Ха╓ ╦╤╧Щ╩Г"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
-msgid "Connecting to server..."
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, c-format
+msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
-msgid " Check for supported types "
+#: mail/mail-config.c:1809
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1
 msgid " color"
 msgstr "╩Ж╩С"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "╟Ха╓"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "╟Ха╓ а╓╨╦"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "╟Ха╓ ╟Э╦╝"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Accounts"
 msgstr "╟Ха╓"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "ц╥╨н"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "юнаУ:"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "юнаУ а╬╥Ы:"
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "фМаЖ юш╪╨"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6939,302 +8390,376 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "г╔╫ц"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "©о╥А"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 #, fuzzy
 msgid "Drafts"
 msgstr "цй╟М"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "╩У фЗ╢У╦╕ ╩Щ╪╨"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:30
+msgid "E_nable"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "гЖюГ фдюою╩ ╢ы╦╔юл╦╖ю╦╥н юЗюЕгу╢о╢ы"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: 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:37
-msgid "Empty trash folders on exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "юЭц╪юл╦╖:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "╪╜╦М:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr ""
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "╧щ╢К"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "╦чюо ╪Ёа╓"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "╦чюо╧з╫╨ гЭ╫д"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
-msgstr "╠Б╨╩ ╟Ха╓ю╦╥н го╠Б"
-
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "╦ч╪╪аЖ ╦с╦╝╦╩"
+msgid "Make this my _default account"
+msgstr "╠Б╨╩ ╟Ха╓ю╦╥н го╠Б"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "╢╨╫╨"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Optional Information"
 msgstr "а╓╨╦ ╬Ью╫"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "а╤аВ:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr "PGP ╟Ф╥н"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Prompt when sending messages with an empty subject"
+#: mail/mail-config.glade.h:57
+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"
+#: mail/mail-config.glade.h:58
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "юн©К(_Q)"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "фМаЖ╦╕ ╧чю╫"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "фМаЖ╦╕ ╧чю╫"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "╧ч╬рю╫"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "╩Г©Кюз а╓╨╦"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "╨╦╬х(_S)"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "фдюою╩ ╟М╦ё╪╪©Д"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP га╥н╠в╥╔ фдюою╩ ╪╠ец"
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
-msgstr "╠Б╨╩ю╦╥н фМаЖ╦╕ HTMLгЭ╫дю╦╥н ╨╦Ё©"
-
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "фМаЖ╦╕ ╨╦Ё©"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "фМаЖ╦╕ ╨╦Ё©"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Sent"
 msgstr "╨╦Ё©"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "╦ч╪╪аЖ╣Ию╩ ╢ы╫ц ╨╦Ё╩╠Б(_R)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "╦ч╪╪аЖ╦╕ фЗ╢У╥н юЗюЕ"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "╪╜╧Ж ╪Ёа╓"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "╪╜╧Ж а╬╥Ы: "
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "╪╜╧Ж╟║ юнаУю╩ ©Д╠╦гу╢о╢ы"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "╪╜╦М фдюо:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "а╓╨╦ ╬Ью╫"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "╟║╩С фЗ╢У"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
+#: mail/mail-config.glade.h:86
+msgid "Use secure connection (_SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:87
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+msgid "_Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+msgid "_Check for supported types"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "юЭюз©ЛфМ аж╪р:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "юЭц╪юл╦╖:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "╪╜╦М:"
+
+#: mail/mail-config.glade.h:100
+msgid "_Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "хё╫╨ф╝:"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
 #: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+msgid "_Log filter actions to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "╩Г©Кюзюл╦╖:"
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "╦ч╪╪аЖ ╦с╦╝╦╩"
 
 #: mail/mail-config.glade.h:105
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
+#, fuzzy
+msgid "_Name:"
+msgstr "юл╦╖:"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "а╤аВ:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "PGP ╟Ф╥н"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "╟Ф╥н:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
 msgstr ""
 
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "юл ╨Я╧п╧Ьхё ╠Б╬О"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "╠Б╨╩ю╦╥н фМаЖ╦╕ HTMLгЭ╫дю╦╥н ╨╦Ё©"
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "╪╜╦М фдюо:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "╩Г©Кюзюл╦╖:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "цй."
 
@@ -7280,201 +8805,212 @@ msgstr "╦ч╫цаЖ юш╪╨ ц╒ю╩ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 msgid "Could not create a S/MIME decode context."
 msgstr "╦ч╫цаЖ юш╪╨ ц╒ю╩ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "ц╥╨нфдюо юЗюЕ"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "╣П╫╨е╘╥н юЗюЕ..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "%s©║╪╜ ©╜╠Б..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "╪Ш╠Х"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "╦ч╫цаЖ Ё╩©Кю╩ юп╬Н╣Е╦╡"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "╪╠ецгя╟м ╨╧╩Г"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "фЗ╢У╥н юЗюЕ(_f)... (╟Мд╔©╧а╓)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "╩Ха╕╣й"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d цй╦╤╢ы"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s ц╥╨н"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Ё╞б╔"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "юЭюз©ЛфМ аж╪р:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "╨╦Ё╫юл"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "х╦╫е аж╪р:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "╧ч╢б╩Г╤В"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "бЭа╤:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP га╥н╠в╥╔юл ╬Ь╫ю╢о╢ы."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "╬охёх╜╣х ╦ч╫цаЖ╢б ╨╦юлаЖ╬йю╫"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "╬охёх╜╣х ╦ч╪╪аЖ"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "%s╟╟ю╨ фЗ╢У╟║ ╬Ью╫"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "`%s'ю╩(╦╕) ©╜╠Б"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" фЗ╢У╦╕ \"%s\" фВ╦Дю╦╥н ╧ы╡ы╠Б"
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, 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
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "%s ╪Ёа╓"
@@ -7495,105 +9031,130 @@ msgstr ""
 "юш╬В ╪ЖгЮаъ ©║╥╞╟║ ╧ъ╩Щгъ╫ю╢о╢ы:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "юл ╨Я╧п╧Ьхё ╠Б╬О"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "фЗ╢У юГ╪Ёа╓"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "фМаЖ╦╕ ╧чю╫"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ╨╦Ё╩╢б аъ"
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё©"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, 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
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "©о╥А╣й"
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "╦ч╪╪аЖ╦╕ фЗ╢У╥н юЗюЕ"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "╦ч╫цаЖ╣Ию╩ %s╥н юл╣©"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "╦ч╫цаЖ╣Ию╩ %s╥н ╨╧╩Г"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "юл╣©аъ"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "╨╧╩Гаъ"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr ""
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s фЗ╢У╦╕ ©╜╠Б"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "%s фЗ╢У╦╕ ©╜╠Б"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "%s фЗ╢У╦╕ ©╜╠Б"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "фЗ╢У ╣©╠Бх╜"
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "фЗ╢У юГ╪Ёа╓"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "фЗ╢У ╨Я©Л╠Б"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "╦ч╪╪аЖ %s╦╕ ╟║а╝©ю╠Б"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "╦ч╪╪аЖ╣Ию╩ ╟║а╝©ю╠Б"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "╦ч╫цаЖ╣Ию╩ юЗюЕ"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7602,7 +9163,7 @@ msgstr ""
 "цБ╥бфдюою╩ ╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7611,11 +9172,11 @@ msgstr ""
 "%s╥н ╦ч╫цаЖ юЗюЕаъ ©ю╥Ы ╧ъ╩Щ:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "ц╥╨н юЗюЕ"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7624,87 +9185,83 @@ msgstr ""
 "цБ╥б фдюою╩ ╦╦╣И╪Ж ╬Ью╫: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "╣╔юле╦╦╕ ╬╣ ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "╟к╩Ж(_S)"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(а╕╦Я╬Ью╫)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "╦ч╪╪аЖ"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё©"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "юЭ╢ч"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "цё╠Б"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "╟Ф╥н:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling..."
 msgstr "цК╪рго╢б аъ..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "фМаЖ аж╟М╧ч╠Б"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "╧ч╬рю╫"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "╟╩╫еаъ ..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "╠Б╢ы╦╝╢б аъ ..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "╨╦Ё╩╢б аъ"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "цК╪р╣й."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 #, fuzzy
 msgid "User canceled operation."
 msgstr "╩Г©Кюз а╓╨╦"
@@ -7724,82 +9281,88 @@ msgstr "юЭ╢ч╣х ╦ч╫цаЖ - %s"
 msgid "Forwarded message"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "╟║╩С фЗ╢У"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "╩У ╟║╩СфЗ╢У"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "юЭ╢ч: (а╕╦Я ╬Ью╫)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "╦ч╪╪аЖ"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "©╘╥╞╟Ёюг ╨╦аЖ╬йю╨ ╦ч╪╪аЖ"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "©ю╢ц %l:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "╬На╕ %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "╦ч╫цаЖ╣Ию╩ юЗюЕ"
 
 #: mail/message-list.etspec.h:2
@@ -7814,39 +9377,77 @@ msgstr "╧ч╬рю╫"
 msgid "Size"
 msgstr "е╘╠Б"
 
-#: 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:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "\"%s\" фЗ╢У╦╕ \"%s\" фВ╦Дю╦╥н ╧ы╡ы╠Б"
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, c-format
-msgid "Getting store for \"%s\""
+msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "фЗ╢У"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "╦ч╪╪аЖ╦╕ ╧ч╬р╫ю╢о╢ы"
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+msgid " _Refresh List "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "фЗ╢У"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "╨╦╠Б ©и╪г"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "╠╦╣╤ ╟Э╦╝(_S)..."
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "╠╦╣╤"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "╠╦╣╤ аъаЖ"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -7855,55 +9456,72 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr ""
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 #, fuzzy
 msgid "Appointments"
 msgstr "╬Ю╪с"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "╬Ю╪с ╨╦╠Б"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "©ю╢ц %l:%M %p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "©ю╢ц %l:%M %p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "©Д╬Ю"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "юл╦╖:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Evolution ╪Ёд║"
+msgid "Summary Settings"
+msgstr "╦чюо ╪Ёа╓(_M)..."
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -7914,7 +9532,12 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>╢ч╥б╦╕ юп╢баъ ©ю╥Ы</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "╩У ╟║╩СфЗ╢У(_N)"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "╬В╧╚"
@@ -7923,27 +9546,32 @@ msgstr "╬В╧╚"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "╠Бе╦"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "╪╫╪г:"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %Y"
 msgstr ""
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolutionю╨..."
+msgid "Print Summary"
+msgstr "©Д╬Ю"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "╦ч╪╪аЖ юн╪Баъ ╫гфп"
 
 #: my-evolution/main.c:52
@@ -7951,6 +9579,42 @@ msgstr "╦ч╪╪аЖ юн╪Баъ ╫гфп"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 
+#: my-evolution/metar.c:29
+msgid "F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "╠ш╡ц"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "юл╣©аъ"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "фМаЖ ╟е╦ё╟Ё(_F)..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "фМаЖ ╟е╦ё╟Ё(_F)..."
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9126,121 +10790,137 @@ 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 "фЗ╢У"
+msgid " _Remove"
+msgstr "а╕╟е"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
+#: my-evolution/my-evolution.glade.h:2
+msgid "Add n_ew feed"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:4
+#: my-evolution/my-evolution.glade.h:3
 #, fuzzy
-msgid "All stations:"
+msgid "Al_l stations:"
 msgstr "╦П╣Г бЭ╪╝юз"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "Display folders:"
-msgstr "╢ы╦╔ фЗ╢У╦╕ г╔╫ц"
+msgid "All _folders:"
+msgstr "фЗ╢У"
+
+#: my-evolution/my-evolution.glade.h:5
+msgid "All news _feeds:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "╨╦╠Б ©и╪г"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "г╔╫ц"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "╠щ©Дюо"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "╢ч"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr " гяаж╬©"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "╬В╧╚"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "╬В╧╚"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "╪Ж©Дюо"
+msgid "Tasks "
+msgstr "юш╬В"
 
 #: my-evolution/my-evolution.glade.h:16
-#, fuzzy
-msgid "One month"
-msgstr "╢ч"
+msgid "Units: "
+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 ""
+msgid "Weather settings"
+msgstr "╪╠ецгя ╨н╨п ╨Я©Р"
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Schedule"
-msgstr ""
+#, fuzzy
+msgid "_Display folders:"
+msgstr "╢ы╦╔ фЗ╢У╦╕ г╔╫ц"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "╬В╧╚"
+msgid "_Display stations:"
+msgstr "╨╦╠Б ©и╪г"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
-msgstr ""
+#, fuzzy
+msgid "_Displayed feeds:"
+msgstr "г╔╫ц"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "╬В╧╚"
+msgid "_Five days"
+msgstr "╠щ©Дюо"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "юш╬В"
+msgid "_Mail"
+msgstr "фМаЖ"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
-msgstr ""
+#, fuzzy
+msgid "_News Feeds"
+msgstr "╩У ╟║╩СфЗ╢У(_N)"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "╠Бе╦"
+msgid "_One day"
+msgstr "╪Ж©Дюо"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "╪╠ецгя ╨н╨п ╨Я©Р"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "imperial"
+msgid "_Schedule"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "╦П╣Г гЛ╢У ╨╦╠Б(_H)"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "╠Бе╦"
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "_imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9257,7 +10937,15 @@ msgstr "юз╪╪хВ"
 msgid "Cancel Operation"
 msgstr "╧лфц цК╪р"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-local-storage.c:178
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "╟║╩С фЗ╢У"
@@ -9305,7 +10993,7 @@ msgid ""
 "`%s'."
 msgstr "фдюою╩ юп╢б ╣╣аъ ©║╥╞ ╧ъ╩Щ"
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9313,7 +11001,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9322,7 +11010,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9330,57 +11018,78 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "фЗ╢У╦╕ ╬Рю╩╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "`%s'╥н фдюою╩\n"
 "╨╧╩Ггр ╪Ж╟║ ╬Ь╫ю╢о╢ы."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "фЗ╢У╥н ╨╧╩Г"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "фЗ╢У╥н юл╣©"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr "фЗ╢У╦╕ ╬Рю╩╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "фЗ╢У ╪╠ец"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "%s фЗ╢У╦╕ ©╜╠Б"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "╠тд╒ юл╦╖: "
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "фЗ╢У юл╦╖:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9394,7 +11103,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "аЖа╓го╫е фЗ╢Уюг юл╦╖юл юШюЩгоаЖ╬й╫ю╢о╢ы"
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ╩У фЗ╢У ╩Щ╪╨"
 
@@ -9404,11 +11113,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "╩У╥н©Н..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(а╕╦Я╬Ью╫)"
 
@@ -9440,7 +11149,7 @@ msgstr ""
 "%s╦╕ ╟║а╝©ю╢б аъ\n"
 "╬фюлеш %d╦╕ ╟║а╝©х."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9489,7 +11198,7 @@ msgstr "юз╣©"
 msgid "Filename:"
 msgstr "фдюо юл╦╖:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "фдюою╩ ╟М╦ё╪╪©Д"
 
@@ -9497,32 +11206,54 @@ msgstr "фдюою╩ ╟М╦ё╪╪©Д"
 msgid "File type:"
 msgstr "фдюо а╬╥Ы:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "фЗ╢У ╪╠ец"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Evolution юш╪╨╠Б╟║ цй╠Бх╜╣гаЖ ╬й╬р╫ю╢о╢ы."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "╫ц╫╨ешюг ╟Ф╥н©║ Bug buddy╦╕ цёю╩╪Ж ╬Ь╫ю╢о╢ы."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy╦╕ ╫ггЮгр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9532,88 +11263,103 @@ msgstr ""
 "юоа╓, ©╛╤ТцЁ ╟Э╦╝╦╕ го╢б ╠в╥Л©Ч╬Н юю©Кга╥н╠в╥╔\n"
 "╦Пю╫ ют╢о╢ы."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "фЗ╢У юл╣©..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "╩У ╢эцЮ╠в╥Лю╩ ╩Щ╪╨"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "©юга╤Сюн©║╪╜ юш╬В"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "©юга╤Сюн©║╪╜ юш╬В"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "╫ц╫╨еш юЗюЕюЕд║╦╕ аЖа╓гр╪Ж ╬Ь╫ю╢о╢ы -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views 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
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "х╝юн"
+
+#: shell/e-shell.c:1644
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:1646
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:1648
+#, fuzzy
+msgid "Configuration Database not found"
+msgstr "╦чюо ╪Ёа╓ Druid"
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "юо╧щ ©ю╥Ы"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "╩У ╢эцЮ╠в╥Лю╩ ╩Щ╪╨"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "╠в╥Л юл╦╖:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9622,180 +11368,167 @@ msgstr ""
 "╢эцЮ ╦╥╢К╥н╨нем `%s'╠в╥Лю╩\n"
 "а╓╦╩╥н аЖ©Л╫ц╟з╫ю╢о╠Н?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "аЖ©ЛаЖ╦╤╪╪©Д"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "юшю╨ ╬фюлдэ(_S)"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "юшю╨ ╬фюлдэю╦╥н ╢эцЮ╦╥╢К ╨╦╠Б"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "е╚ ╬фюлдэ(_L)"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "е╚ ╬фюлдэю╦╥н ╢эцЮ╦╥╢К ╨╦╠Б"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "╩У ╠в╥Л(_N)..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "╩У ╢эцЮ╠в╥Лю╩ ╩Щ╪╨"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "╩У ╠в╥Л(_N)..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "╢эцЮ ╦╥╢К ╟╗цъ╠Б(_H)"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "╢эцЮ ╦╥╢К╦╕ ╟╗цЦ╢о╢ы"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 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
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, fuzzy
 msgid "Shortcuts"
 msgstr "╢эцЮ ╦╥╢К(_S)"
 
-#: 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:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(юл╦╖ ╬Ью╫)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "©║╥╞ ╬Ью╫"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "юо╧щ ©ю╥Ы"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "╟╟ю╨ юл╦╖юг фЗ╢У╟║ юл╧л а╦юГгу╢о╢ы"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "аЖа╓╣х фЗем гЭ╫дюл ©ц╧ы╦ёаЖ ╬й╫ю╢о╢ы"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "ютцБ╥б ©ю╥Ы"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "фЗ╢У╦╕ ╦╦╣И╠Б©║ цФ╨пгя ╟Ь╟ёюл ╬Ью╫"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "аЖа╓╣х фЗ╢У╦╕ цёю╩╪Ж ╬Ь╫ю╢о╢ы"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "юш╣©юл аЖ©Ь╣гаЖ ╬йю╫"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "юл юЗюЕ╦ец╪©║ аЖа╓╣х гЭ╫дюл аЖ©Ь╣гаЖ ╬й╫ю╢о╢ы"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "аЖа╓╣х фЗ╢У╦╕ цёю╩╪Ж ╬Ь╫ю╢о╢ы"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% ©о╥А(_p):"
 
@@ -9817,10 +11550,6 @@ msgstr "хё╫╨ф╝:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "фЗ╢У юл╦╖:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "фЗ╢У а╬╥Ы:"
@@ -9834,17 +11563,28 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Evolutionю╦╥н фдюою╩ ╟║а╝©ю╫г╥а╦И \"╟║а╝©ю╠Б\"╦╕ ╢╘╦ё╪╪©Д."
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr ""
+#, fuzzy
+msgid "Evolution Import Assistant"
+msgstr "Evolution ╪Ёд║"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
+msgstr "Evolution ╪Ёд║"
+
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
 msgstr ""
 
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -9864,10 +11604,10 @@ msgid "Don't ask me again"
 msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╫ц ╨╪ ╪Ж ╬Ь╫ю╢о╢ы"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9884,7 +11624,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9892,25 +11632,30 @@ msgstr ""
 "╟╗╩Ггу╢о╢ы\n"
 "Evolution фю\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Evolution ╫╘ю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Evolution ╫╘ю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "╨╦ЁК╨╦ ддфВЁмф╝ ╫ц╫╨ешю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "╨╧╩Г"
 
@@ -9927,11 +11672,11 @@ msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
 msgid "Create new contact list"
 msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "юз╦ё╠Б"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "╪╠ецгя╟м юз╦╖"
 
@@ -9940,78 +11685,122 @@ msgstr "╪╠ецгя╟м юз╦╖"
 msgid "Delete selected contacts"
 msgstr "©╛╤ТцЁ╦╕ аЖ©Н╢ы"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "╩У ©╛╤ТцЁ"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "╢╨╫╨"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "╨ыюл╠Б"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨ы©╘Ёж╠Б"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "юн╪Б╣и ╦ч╫цаЖ╦╕ ╧л╦╝╨╬╢о╢ы"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "©╛╤ТцЁ╦╕ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "©╛╤ТцЁ╦╕ аЖ©Н╢ы"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "юЭ╨н ╪╠ец"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "©╛╤ТцЁ╦╕ аЖ©Н╢ы"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Ё╙аъ©║ ╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "©╛╤ТцЁ╦╕ аЖ©Н╢ы"
+
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Ё╙аъ©║ ╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н юл╣©гу╢о╢ы"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "аъаЖ"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "цК╪р"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "гЮ╣©(_A)"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "©╛╤ТцЁ(_C)"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "©╛╤ТцЁ(_C)..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "юн╪Б(_P)..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "VCard╥н юЗюЕ"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "©╛╤ТцЁ цё╠Б(_S)"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "╣╣╠╦(_T)"
 
@@ -10021,113 +11810,134 @@ 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"
-msgstr "╩У╥н©Н ╬Ю╪с╦╕ ╦╦╣Г╢ы"
+msgid "Create a New _Task"
+msgstr "╩У ╢ч╥бю╩ ╦╦╣Л╢о╢ы"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "╩У╥н©Н ╬Ю╪с╦╕ ╦╦╣Г╢ы"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Day"
+msgstr "╢Е╩У╬©"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "юл ╬Ю╪сю╩ ╩Ха╕гу╢о╢ы"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "╟║╠Б"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "╫ц╟ё╩Сю╦╥н ╣з╥н ╟║╠Б"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "╫ц╟ё╩Сю╦╥н ╬ую╦╥н ╟║╠Б"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Ё╞б╔╥н юл╣©(_D)"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "аЖа╓гя Ё╞╥н ╟║╠Б"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "гЖюГ ╫ц╟ёю╦╥н юл╣©"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "©ю╢ц╥н юл╣©"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "╢ч(_M)"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "╩У ╬Ю╪с"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "юн╪Б╣и ╦ч╫цаЖ╦╕ ╧л╦╝╨╬╢о╢ы"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "╢ч╥б юн╪Бго╠Б"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "гЖюГюг ╢ч╥бю╩ юн╪Бгу╢о╢ы"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "юн╪Б ╧л╦╝╨╦╠Б(_v)"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "╩Г©Кюз а╓╨╦"
+msgid "Print this calendar"
+msgstr "гЖюГюг ╢ч╥бю╩ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "го╥Г╬© ╨╦╠Б"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "гя╢ч╬© ╨╦╠Б"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "гяаж╬© ╨╦╠Б"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr ""
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "Week"
+msgstr "аж(_W)"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "╬Ю╪с(_A)"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "╦чюо ╪Ёа╓(_M)..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "╢ч(_M)"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "╩Г©Кюз а╓╨╦"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "аж(_W)"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "юш╬В"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10138,15 +11948,16 @@ msgid "Close"
 msgstr "╢щ╠Б"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "юл ╬Ю╪сю╩ ╢щ╫ю╢о╢ы"
+#, fuzzy
+msgid "Close this item"
+msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "юл ╬Ю╪сю╩ ╩Ха╕гу╢о╢ы"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr ""
 
@@ -10155,117 +11966,85 @@ msgstr ""
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "юн╪Б..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "юЗюЕ"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "юш╬Вю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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 "╩Ха╕..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "╣╣©Р╦╩"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "╨юеУ юн╪Б(_v)..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ(_A)..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "©б╤Сюн ╣╣©Р╦╩ю╩ ╨╦©╘аь╢ы"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "юЗюЕ(_S)"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "╩Ха╕..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "юш╬Вю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "╢ы╦╔ юл╣Ию╩ цй╢К(_I)..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "╢ы╦╔юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ..."
@@ -10275,21 +12054,21 @@ msgstr "╢ы╦╔юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ..."
 msgid "Cancel Mee_ting"
 msgstr "╧лфц цК╪р"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "╢ч╥б ╨р╥╞╣Июл╠Б"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╦╔╩Г╤В©║╟т юЭ╢чгу╢о╢ы"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10302,15 +12081,10 @@ msgstr "╧лфц цК╪р"
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-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 "гЮ╣©(_A)"
-
 #: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10327,67 +12101,64 @@ msgid "Cancel the current mail operation"
 msgstr "гЖюГ фдюою╩ юЗюЕ"
 
 #: 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
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "╠Б╬О╣х ╬охё ╧Ж╦╝╠Б"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "╠╦╣╤ ╟Э╦╝(_S)..."
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "╦ч╪╪аЖ"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "╨╦Ё╩╟М ╧ч╠Б"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "╧п╦╟ фМаЖ╦╕ ╨╦Ё╩╟М ╩У фМаЖ╦╕ ╟║а╝©б╢ы"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "╟║╩С фЗ╢У фМаЩ╠Б(_E)..."
 
@@ -10412,94 +12183,105 @@ msgstr "╧л╦╝╨╦╠Б"
 msgid "_Send / Receive"
 msgstr "╨╦Ё╩╟М ╧ч╠Б(_S)"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "фЗ╢У╥н юл╣©(_M)..."
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "╪╠ец╣х ╦ч╪╪аЖ ╪Ш╠Х(_S)"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "юз╦ё╠Б"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "╪╠ец╣х ╦ч╪╪аЖ ╪Ш╠Х(_S)"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "╩Ха╕╣х ╦ч╪╪аЖ ╪Ш╠Х(_D)"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "юпю╨ ╦ч╪╪аЖ ╪Ш╠Х(_R)"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "юЭ╨н╦╕ юпю╨ ╟мю╦╥н г╔╫ц(_e)"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨ы©╘Ёж╠Б"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "юЭ╨н ╪╠ец(_A)"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "╠ше╦╥║ ╪╠ец(_T)"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "юл ╦ч╪╪аЖ╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "╦П╣н ╨╦╠Б(_A)"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "юпю╨ ╦ч╪╪аЖ ╪Ш╠Х(_R)"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "©╛╟Э╣х ╦ч╪╪аЖ ╦Я╥о"
 
@@ -10507,7 +12289,7 @@ msgstr "©╛╟Э╣х ╦ч╪╪аЖ ╦Я╥о"
 msgid "_Expunge"
 msgstr "а╕╟е(_E)"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "фЗ╢У(_F)"
 
@@ -10515,11 +12297,11 @@ msgstr "фЗ╢У(_F)"
 msgid "_Invert Selection"
 msgstr "╪╠ец ╧щюЭ(_I)"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "╪Ёа╓(_P)..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "©╛╟Э╣х ╦ч╪╪аЖ ╦Я╥о"
@@ -10766,7 +12548,8 @@ 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"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "юн╪Б╣и ╦ч╫цаЖ╦╕ ╧л╦╝╨╬╢о╢ы"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10788,43 +12571,37 @@ msgstr "╦ч╪╪аЖ юн╪Б"
 msgid "Previous Unread Message"
 msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "╦ч╪╪аЖ юн╪Б"
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "юн╪Б ╧л╦╝╨╦╠Б"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "х╦╫е"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "юЭц╪ х╦╫е"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "фМаЖ ╦ч╪╪аЖ(_M)"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "╦ч╪╪аЖ╦╕ аЖа╓гя фЗ╢У╥н юЗюЕгу╢о╢ы"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -10873,74 +12650,57 @@ msgstr "╪Ж╫еюз©║╣Ш╦╔ ╟║╩СфЗ╢У(_R)"
 msgid "VFolder on _Subject..."
 msgstr "а╕╦Я©║╣Ш╦╔ ╟║╩СфЗ╢У(_S)"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "╟е╦ё╟Ё юШ©К(_A)"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "фЗ╢У╥н ╨╧╩Г"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "╦ч╫цаЖ╥н╨нем ╟е╦ё╟т ╩Щ╪╨(_C)"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "г╔╫ц"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "фЗ╢У╥н юл╣©"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "г╔╫ц"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "╦ч╪╪аЖ╣Ию╩ ╢ы╫ц ╨╦Ё╩╠Б(_R)"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "╦ч╪╪аЖ╣Ию╩ ╢ы╫ц ╨╦Ё╩╠Б(_R)"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "юл ц╒ю╩ ╢щ╫ю╢о╢ы"
 
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "╢щ╠Б(_C)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "╨╦╠Б(_V)"
 
@@ -11007,11 +12767,6 @@ msgstr "PGP ╬охёх╜"
 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 "╢ы╦╔юл╦╖ю╦╥н юЗюЕ"
@@ -11142,7 +12897,7 @@ msgstr "х╦╫е аж╪р гв╦Я(_R)"
 msgid "_Security"
 msgstr "╨╦╬х(_S)"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "╣╣©Р╦╩(_H)"
 
@@ -11176,15 +12931,28 @@ msgstr "╠╦╣╤ аъаЖ"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "©╧╬Ю╣й"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "цК╪р╣й"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
+msgid "Cancel this task"
+msgstr "цК╪р╣й"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr ""
 
@@ -11192,44 +12960,32 @@ msgstr ""
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "╪╠ец╣х ╦ч╪╪аЖ ©╜╠Б(_S)"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "╦чюо ╪Ёа╓(_M)..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr ""
 
@@ -11266,182 +13022,163 @@ msgstr ""
 msgid "Create a new folder"
 msgstr "╩У фЗ╢У╦╕ ╩Щ╪╨"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "╢ы╦╔ фЗ╢У╦╕ г╔╫ц"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "а╬╥А(_x)"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution ╪Ёд║"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "га╥н╠в╥╔ю╩ ╦╤д╗╢о╢ы"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "╫цюшго╠Б"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "%sю╩(╦╕) ©чбйю╦╥н юл╣©"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Evolutionюг а╓╨╦ ╨╦╠Б"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "╧Ж╠в а╕╨╦"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "╧Ж╠в а╕╨╦(_B)"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy╥н ╧Ж╠ва╕╨╦╦╕ гу╢о╢ы"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 #, 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:35
-msgid "Using the _Calendar"
-msgstr "╢ч╥б ╩Г©Кго╠Б(_C)"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr ""
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "╪╠ец╣х фЗ╢У ╨╦╠Б"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "Evolutionю╨(_A)..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "╬Ю╪с(_A) (╟Мд╔©╧а╓)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "©╛╟А(_C) (╟Мд╔©╧а╓)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "╨╧╩Г(_C)"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "фЗ╢У╥н ╟║╠Б(_G)..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
-msgstr ""
-
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "╩Жюн(_I)"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "фМаЖ ╦ч╪╪аЖ(_M)"
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
+msgstr "фЗ╢У╥н ╟║╠Б(_G)..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "юл╣©"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "╩У╥н©Н(_N)"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "╩У ╟║╩СфЗ╢У(_N)"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "©╜╠Б(_O)..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "╢эцЮ ╦╥╢К(_S)"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "╢эцЮ ╦╥╢К(_S)"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "©юга╤Сюн©║╪╜ юш╬В"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "╨Д╦╕ %s╥н ╨╞╟Ф"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr "©Д╬Ю"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "юпю╫"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
 msgstr "╦чюо ╪Ёа╓(_M)..."
 
 #: views/addressbook/galview.xml.h:1
@@ -11484,6 +13221,30 @@ msgstr "╦ч╪╪аЖ"
 msgid "With Category"
 msgstr "╦Я╥о:"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "фдюою╩ ╟М╦ё╪╪©Д"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "╪╫╪г:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"╫ц╟ё╢К: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11491,10 +13252,6 @@ msgstr "╦Я╥о:"
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "╧ы╩щ"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "╩Г╧╚╫г ╤╟Ё╡"
@@ -11567,7 +13324,7 @@ msgstr "╦П╣Г бЭ╪╝юз"
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11577,19 +13334,20 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "гЖюГ"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "©ю╢ц"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "х╝юн"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -11675,35 +13433,33 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "©╛╤ТцЁ фМаЩ╠Б"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "╟М╠ч ╟к╩Ж"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "╢ч╥б©║ цъ╟║"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "╨Я©Р(_l)"
 
 #: 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 "©║╥╞"
@@ -11721,10 +13477,15 @@ msgstr "╦ч╪╪аЖ"
 msgid "Don't show this message again."
 msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╫ц ╨╪ ╪Ж ╬Ь╫ю╢о╢ы"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "╟к╩Ж(_c)"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "цё╠Б"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "╟Ёюн©К аж╪р╥о ╪╜╧Ж"
@@ -11745,6 +13506,172 @@ msgstr "init_corba(): ╠вЁПю╩ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 
+#~ msgid "RDF Summary"
+#~ msgstr "RDF ©Д╬Ю"
+
+#~ msgid "LDAP Server"
+#~ msgstr "LDAP ╪╜╧Ж"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "╬к╪Ж╬Ь╢б аж╪р╥о гЭ╫д"
+
+#~ msgid "Root DN:"
+#~ msgstr "╥Гф╝ DN:"
+
+#~ msgid "Authentication:"
+#~ msgstr "юнаУ:"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "╟Ф╥н╟║ а╦юГгоаЖ ╬йю╦╦И ╦╦╣Л╢о╢ы."
+
+#~ msgid "Name"
+#~ msgstr "юл╦╖"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "юл╦╖ю╩ ╪╠ецгр ╟В:"
+
+#~ msgid "USA"
+#~ msgstr "╧л╠╧"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "цК╪р╣й"
+
+#~ msgid "Transparent"
+#~ msgstr "еУ╦М"
+
+#~ msgid "Opaque"
+#~ msgstr "╨реУ╦М"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "╢ч╥б ╪Ёа╓"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "╦П╣Г ╬Ю╪сю╩ ╩С╠Б╫це╟╠Б"
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "╩Ха╕╣й"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "(юл╦╖ ╬Ью╫)"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% ©о╥А(_p):"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "юл ╦ч╫цаЖ╢б гЖюГ ╨╦©╘аы ╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#~ msgid "All"
+#~ msgstr "╦П╣н"
+
+#~ msgid "Edit"
+#~ msgstr "фМаЩ"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "╟║╩С фЗ╢У╥н цё╠Б╦╕ юЗюЕ"
+
+#~ msgid "Resend"
+#~ msgstr "╢ы╫ц ╨╦Ё©"
+
+#~ msgid "Receiving"
+#~ msgstr "╧ч╬рю╫"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Evolution ╪Ёд║"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolutionю╨..."
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "╦ч╪╪аЖ юн╪Баъ ╫гфп"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolutionю╨..."
+
+#~ msgid "New contact"
+#~ msgstr "╩У ©╛╤ТцЁ"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "©╛╤ТцЁ(_C)"
+
+#~ msgid "Go to present time"
+#~ msgstr "гЖюГ ╫ц╟ёю╦╥н юл╣©"
+
+#~ msgid "Close this appointment"
+#~ msgstr "юл ╬Ю╪сю╩ ╢щ╫ю╢о╢ы"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "юн╪Б ╪Ёа╓"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "гЮ╣©(_A)"
+
+#~ msgid "Help"
+#~ msgstr "╣╣©Р╦╩"
+
+#~ msgid "See online help"
+#~ msgstr "©б╤Сюн ╣╣©Р╦╩ю╩ ╨╦©╘аь╢ы"
+
+#~ msgid "Compose"
+#~ msgstr "фМаЖ юш╪╨"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "╠╦╣╤ ╟Э╦╝(_S)..."
+
+#~ msgid "Show _All"
+#~ msgstr "╦П╣н ╨╦╠Б(_A)"
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "юн╪Б ╧л╦╝╨╦╠Б"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "╦ч╪╪аЖ╣Ию╩ ╢ы╫ц ╨╦Ё╩╠Б(_R)"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
+
+#~ msgid "Getting _Started"
+#~ msgstr "╫цюшго╠Б"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "╢ч╥б ╩Г©Кго╠Б(_C)"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "╬Ю╪с(_A) (╟Мд╔©╧а╓)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "©╛╟А(_C) (╟Мд╔©╧а╓)"
+
+#~ msgid "_Index"
+#~ msgstr "╩Жюн(_I)"
+
+#~ msgid "_Mail message"
+#~ msgstr "фМаЖ ╦ч╪╪аЖ(_M)"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "╦чюо ╪Ёа╓(_M)..."
+
 #, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "╪Ёа╓ю╩ ╨╞╟Фгу╢о╢ы"
@@ -11774,15 +13701,9 @@ msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 #~ 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 "юш╬В фМаЩ"
 
@@ -11798,12 +13719,6 @@ msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 #~ msgid "Edit the task"
 #~ msgstr "юоа╓ фМаЩ"
 
-#~ msgid "Go to Today"
-#~ msgstr "©ю╢ц╥н юл╣©"
-
-#~ msgid "Add to Calendar"
-#~ msgstr "╢ч╥б©║ цъ╟║"
-
 #~ msgid "Update Calendar"
 #~ msgstr "╢ч╥б ╟╩╫е"
 
@@ -11878,9 +13793,6 @@ msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 #~ "HTML фдюою╩ ©╜ ╪Ж╟║ ╬Ь╫ю╢о╢ы:\n"
 #~ "%s"
 
-#~ msgid "RDF Summary"
-#~ msgstr "RDF ©Д╬Ю"
-
 #~ msgid "Update automatically"
 #~ msgstr "юз╣©ю╦╥н ╟╩╫е"
 
@@ -11899,21 +13811,12 @@ msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 #~ 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 "юл ╨Я╧п╧Ьхё ╠Б╬О"
 
@@ -11923,9 +13826,6 @@ msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 #~ 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\"."
@@ -11952,18 +13852,15 @@ msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 #~ 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>"
+#~ "-----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>"
+#~ "-----юЭ╢ч ╦ч╫цаЖ-----<br><b>╨╦Ё╫ ╩Г╤В:</b> %s<br><b>╧ч╢б ╩Г╤В:</b> %"
+#~ "s<br><b>а╕╦Я:</b> %s<br>"
 
 #~ msgid "Evolution files successfully installed."
 #~ msgstr "Evolution фдюо╣Июл а╕╢К╥н ╪Ёд║╣г╬З╣г╬З╫ю╢о╢ы."
@@ -11980,12 +13877,6 @@ msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 #~ msgid "View all contacts"
 #~ msgstr "╦П╣Г ©╛╤ТцЁ ╨╦╠Б"
 
-#~ msgid "5 Days"
-#~ msgstr "╢Е╩У╬©"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "╩У ╢ч╥бю╩ ╦╦╣Л╢о╢ы"
-
 #~ msgid "Open Calendar"
 #~ msgstr "╢ч╥б ©╜╠Б"
 
@@ -12007,9 +13898,6 @@ msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 #~ msgid "Actio_ns"
 #~ msgstr "гЮ╣©(_n)"
 
-#~ msgid "C_lear"
-#~ msgstr "╨Я©Р(_l)"
-
 #~ msgid "Cop_y to Folder... (FIXME)"
 #~ msgstr "фЗ╢У╥н ╨╧╩Г..."
 
@@ -12052,9 +13940,6 @@ msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 #~ msgid "_Move to Folder... (FIXME)"
 #~ msgstr "фЗ╢У╥н юл╣©(_M)..."
 
-#~ msgid "New Mail"
-#~ msgstr "╩У фМаЖ"
-
 #~ msgid "Print message to the printer"
 #~ msgstr "╦ч╫цаЖ юн╪Б"
 
diff --git a/po/lt.po b/po/lt.po
index 1b1a3594e9..dadcfda4a4 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.13\n"
-"POT-Creation-Date: 2001-08-21 22:54+0200\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2001-08-17 07:59+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -527,12 +527,12 @@ msgstr "_SЮskaitos vardas:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:89 my-evolution/my-evolution.glade.h:18
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_PridКti"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:94
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
@@ -644,18 +644,18 @@ msgstr "(jokio)"
 
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "Pagrindinis el. paПtas"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "El. paПtas 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
 #: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "El. paПtas 3"
@@ -678,19 +678,19 @@ msgstr "PridКti adresЮ prie esanХio kontakto ╔%s╢"
 msgid "Querying Addressbook..."
 msgstr "UЧklausiama adresЬ knygelК..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Keisti kontakto informacijЮ"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "PridКti prie kontaktЬ"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "аlieti el. paПto adresЮ"
 
@@ -851,7 +851,7 @@ msgstr "_Kontaktai..."
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1322 mail/mail-config.glade.h:93
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -914,94 +914,99 @@ msgstr "IПtrinti kontaktЮ?"
 msgid "This contact belongs to these categories:"
 msgstr "пis kontaktas priklauso Пioms kategorijoms:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
 #: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Asistento"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1558
-#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Darbo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1559
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Darbo 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1560
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
 #: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Darbo faksas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Atsakiklis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Automobilio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Kompanijos"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/contact-editor/e-contact-editor.c:1626
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "NamЬ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "NamЬ 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
 #: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "NamЬ faksas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
 #: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Mobilus"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-#: addressbook/gui/contact-editor/e-contact-editor.c:1627
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Kitas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
 #: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Kitas faksas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
 #: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "IeПkas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Pagrindinis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
 #: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
 #: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Teleksas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "NegalКjau iПtrinti aplanko santraukos bylos ╔%s╢: %s"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Kontakto greitas pridКjimas"
@@ -2382,8 +2387,8 @@ msgid "Success"
 msgstr "SКkmК"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1651
-#: shell/e-storage.c:503
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "NeЧinoma klaida"
 
@@ -2392,7 +2397,7 @@ msgstr "NeЧinoma klaida"
 msgid "Repository offline"
 msgstr "Dirbti atsijungus"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "PriКjimas uЧdraustas"
 
@@ -3101,9 +3106,9 @@ msgstr "NeapibrКЧtas"
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1416
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
 #: mail/mail-accounts.c:144 mail/mail-accounts.c:392
-#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1454
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
 #: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
@@ -3206,23 +3211,23 @@ msgstr "Nauja uЧduotis"
 msgid "The URI that the calendar will display"
 msgstr "URI, kurА rodys kalendorius"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr "PerspКjimЬ garsu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr "PerspКjimЬ praneПimu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr "PerspКjimЬ paПtu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr "PerspКjimЬ programa parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr "NeЧinomЬ perspКjimЬ parinktys"
 
@@ -3408,7 +3413,7 @@ msgstr "Аvykio pabaigЮ"
 msgid "hour(s)"
 msgstr "valandЮ(as)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:114
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minutФ(es)"
 
@@ -4071,7 +4076,7 @@ msgid "Status"
 msgstr "BШsena"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:84
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipas"
@@ -4713,12 +4718,12 @@ msgstr "Metodas, reikalingas Аkelti ╔%s╢, nepalaikomas"
 msgid "New _Appointment..."
 msgstr "Naujas А_vykis..."
 
-#: calendar/gui/gnome-cal.c:1258
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "NegalКjau atidaryti aplanko su ╔%s╢"
 
-#: calendar/gui/gnome-cal.c:1269
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti ╔%s╢, nepalaikomas"
@@ -4779,7 +4784,7 @@ msgstr "Spalis"
 msgid "September"
 msgstr "RugsКjis"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -5568,7 +5573,7 @@ msgstr "NeЧinoma autentikacijos bШsena."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "SlaptaЧodis"
 
@@ -6171,7 +6176,7 @@ msgstr "NegalКjau padaryti aplanko santraukos: %s: %s"
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1550
+#: camel/providers/local/camel-spool-summary.c:931
 #, fuzzy
 msgid "Synchronizing folder"
 msgstr "Sinchronizuojamas aplankas"
@@ -6383,35 +6388,35 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "NegalКjau atidaryti ar sukurti .newsrc bylos dКl %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:190
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "ParsiunХiama POP santrauka"
 
-#: camel/providers/pop3/camel-pop3-folder.c:196
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "NegalКjau patikrinti, ar POP serveryje yra naujЬ laiПkЬ: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:236
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "NegalКjau atidaryti aplanko: laiПkЬ sЮraПas buvo nepilnas."
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "NegalКjau parsiЬsti laiПko: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "NegalКjau parsiЬsti laiПko iП POP serverio %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "NКra laiПko su uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ParsiunХiamas POP laiПkas %d"
@@ -6429,7 +6434,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:52
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -6524,7 +6529,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:71
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6577,7 +6582,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:64
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -6981,21 +6986,21 @@ msgstr "IПsaugoti kaip..."
 msgid "Warning!"
 msgstr "аspКjimas!"
 
-#: composer/e-msg-composer.c:876
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida iПsaugant bylЮ: %s"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida Аkeliant bylЮ: %s"
 
-#: composer/e-msg-composer.c:989
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7003,16 +7008,16 @@ msgstr ""
 "Nepavyko atidaryti Пios sЮskaitos juodraПХiЬ aplanko.\n"
 "Ar norКtum naudoti АprastinА juodraПХiЬ aplankЮ?"
 
-#: composer/e-msg-composer.c:1042
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1050
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti laiПko iП redaktoriaus"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7021,7 +7026,7 @@ msgstr ""
 "Negaliu sukurti iПvesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1062
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7030,7 +7035,7 @@ msgstr ""
 "Negaliu sukurti iПvesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7039,15 +7044,16 @@ msgstr ""
 "Klaida automatiПkai iПsaugant laiПkЮ: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1171
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution rado neiПsaugotЬ bylЬ iП praeitos sesijos.\n"
 "Ar norКtum pabandyti jas atkurti?"
 
-#: composer/e-msg-composer.c:1319
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7057,24 +7063,24 @@ msgstr ""
 "\n"
 "Ar norКtum iПsaugoti jo pakeitimus?"
 
-#: composer/e-msg-composer.c:1326 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1349
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Atidaryti bylЮ"
 
-#: composer/e-msg-composer.c:1498
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "аterpti bylЮ"
 
-#: composer/e-msg-composer.c:1874 composer/e-msg-composer.c:2315
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Sukurti laiПkЮ"
 
-#: composer/e-msg-composer.c:2405
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "NegalКjau sukurti raПyklКs lango."
 
@@ -7343,7 +7349,7 @@ msgstr ""
 "PraПau, grАЧk atgal ir nurodyk tikrЮ aplankЮ, А kurА perkelti laiПkus."
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:808
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Pasirink aplankЮ"
 
@@ -7660,12 +7666,12 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importuoti"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
 #: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "PaПtas"
@@ -7694,11 +7700,11 @@ msgstr ""
 "Evolution rado GnomeCard bylЬ.\n"
 "Ar norКtum jas importuoti А Evolution?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7990,15 +7996,15 @@ msgid "Evolution News Editor"
 msgstr "Evolution naujienЬ tvarkyklК"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolution sЮskaitЬ tvarkyklК"
 
-#: mail/mail-account-gui.c:998
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "IПsaugoti paraПЮ"
 
-#: mail/mail-account-gui.c:1004
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8008,6 +8014,10 @@ msgstr ""
 "\n"
 "Ar norКtum iПsaugoti pakeitimus?"
 
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
 #: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (Аprasta)"
@@ -8037,7 +8047,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "Ar tu tikrai nori iПtrinti ПiЮ naujienЬ sЮskaitЮ?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:759 mail/mail-config.glade.h:41
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "PaПto nuostatos"
 
@@ -8272,7 +8282,7 @@ msgstr ""
 "bus naudojamas tik vaizdavimui."
 
 #. set window title
-#: mail/mail-config-druid.c:589
+#: mail/mail-config-druid.c:558
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolution importavimo priemonК"
@@ -8403,198 +8413,203 @@ msgstr "JuodraПХiЬ aplankas:"
 msgid "E_nable"
 msgstr "аju_ngti"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "IПsaugoti esamЮ bylЮ kitokiu vardu"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Taisyti..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "аjungta"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "HTML paraПo byla:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "AsmenybК"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Viduje"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "PaПto nustatymas"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "PaПto dКЧutКs vieta"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Pa_daryti ПiЮ sЮskaitЮ Аprastine"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "NNTP serveris:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Naujienos"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "NebШtina informacija"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Pasirink spalvЮ"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Paklausti prieП siunХiant laiПkus su _tuПХia tema"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Paklausti prieП siunХiant laiПkus vien tik su _Bcc gavКjais"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "PaПto gavimas"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "PaПto gavimas"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Gavimo nuostatos"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "BШtina informacija"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Saugumas"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Pasirink Filtro log'o bylЮ..."
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Select PGP binary"
 msgstr "Pasirink PGP"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "PaПto siuntimas"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "PaПto siuntimas"
 
-#: mail/mail-config.glade.h:72 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "SiЬsti laiПkai"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "IПsiЬsti laiПkai ir juodraПХiai"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "IПsiЬstЬ laiПkЬ aplankas:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Serverio tipas:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
 msgstr "Serveris reikalauja _autentikacijos"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "ParaПo byla:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "пaltinis"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "пaltinio informacija"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "пaltiniai"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Ypatingi aplankai"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "StandartinК Unix mbox"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr "Naudoti saugiЮ jungtА (_SSL)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -8605,104 +8620,104 @@ msgstr ""
 "\n"
 "Spausk ╔Tolyn╢, kad pradКtum."
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
 msgstr "_AutomatiПkai tikrinti paПtЮ kas"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
 msgstr "_Patikrinti, kokie tipai palaikomi"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
 msgstr "_El. paПto adresas:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Full Name:"
 msgstr "_Pilnas vardas:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "_HTML paraПas:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr "_ParyПkinti citatas su"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
 msgstr "_Hostas:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
 msgstr "_PaЧymКti laiПkus skaitytais po"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Organization:"
 msgstr "_Organizacija:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP uЧПifruoti"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "_Kelias:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Prisiminti ПА slaptaЧodА"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "аprastai siЬsti laiПkus _HTML formatu."
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "_ParaПo byla:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "_Vartotojo vardas:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "sekundЧiЬ."
 
@@ -9013,7 +9028,7 @@ msgstr "SiunХiamas laiПkas %d iП %d"
 msgid "Failed on message %d of %d"
 msgstr "NesКkmК ties laiПku %d iП %d"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "UЧbaigta."
 
@@ -9073,30 +9088,35 @@ msgstr "Atidaromas aplankas %s"
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1600
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Sinchronizuojamas aplankas"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1636
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "IПvalomas aplankas"
 
-#: mail/mail-ops.c:1685
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas laiПkas %s"
 
-#: mail/mail-ops.c:1752
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Gaunami %d laiПkai"
 
-#: mail/mail-ops.c:1838
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "IПsaugomi %d laiПkai"
 
-#: mail/mail-ops.c:1918
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9105,7 +9125,7 @@ msgstr ""
 "Negaliu sukurti iПvesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9114,11 +9134,11 @@ msgstr ""
 "Klaida iПsaugant laiПkus А: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "IПsaugomas priedas"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9127,12 +9147,12 @@ msgstr ""
 "Negaliu sukurti iПvesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "NegalКjau АraПyti duomenЬ: %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
@@ -9189,7 +9209,7 @@ msgstr "Atnaujinama..."
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Nutraukta."
 
@@ -9403,7 +9423,7 @@ msgstr "%H:%M"
 msgid "%a %l:%M%p"
 msgstr "%a %H:%M"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "PaПto apЧvalga"
 
@@ -9412,7 +9432,7 @@ msgstr "PaПto apЧvalga"
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
 #: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:602
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
@@ -9451,8 +9471,9 @@ msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Klaida parsiunХiant RDF</b>"
 
 #: my-evolution/e-summary-rdf.c:479
-msgid "RDF Summary"
-msgstr "RDF apЧvalga"
+#, fuzzy
+msgid "News Feed"
+msgstr "_Naujas aplankas"
 
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
@@ -9471,7 +9492,7 @@ msgstr ""
 msgid "Weather"
 msgstr "_Orai"
 
-#: my-evolution/e-summary-weather.c:663
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Regionai"
 
@@ -10815,7 +10836,7 @@ msgstr "Gauti laiПkai"
 msgid "Outbox"
 msgstr "SiunХiami laiПkai"
 
-#: shell/e-local-storage.c:592
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Vietiniai aplankai"
 
@@ -10913,25 +10934,25 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Kopijuoti aplankЮ"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Perkelti aplankЮ"
 
-#: shell/e-shell-folder-commands.c:357
+#: shell/e-shell-folder-commands.c:358
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -10940,30 +10961,30 @@ msgstr ""
 "NegalКjau iПtrinti aplanko ╔%s╢:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "IПtrinti po %s dienos(Ь)"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:384
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Ar tu tikrai nori iПtrinti uЧduotА ╔%s╢?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:458
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Pervadinti aplankЮ ╔%s╢"
 
-#: shell/e-shell-folder-commands.c:462 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Pervadinti"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:470
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Aplanko pavadinimas:"
@@ -10997,7 +11018,7 @@ msgstr ""
 msgid "New..."
 msgstr "Naujas..."
 
-#: shell/e-shell-folder-title-bar.c:577 shell/e-shell-folder-title-bar.c:578
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
@@ -11106,13 +11127,25 @@ msgstr ""
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:539
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "NegalКjau inicializuoti Evolution apvalkalo."
+
+#: shell/e-shell-startup-wizard.c:558
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:542
+#: shell/e-shell-startup-wizard.c:561
 msgid "Starting Intelligent Importers"
 msgstr ""
 
@@ -11189,12 +11222,12 @@ msgstr ""
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:508
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1437
+#: shell/e-shell.c:1438
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11203,25 +11236,25 @@ msgstr ""
 "Vaje!  ╔%s╢ rodinys netikКtai numirК.  :-(\n"
 "Tikriausiai tai reiПkia, kad %s komponentas nulШЧo."
 
-#: shell/e-shell.c:1641 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Gerai"
 
-#: shell/e-shell.c:1643
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:1645
+#: shell/e-shell.c:1646
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "Negaliu uЧregistruoti saugyklos apvalkale"
 
-#: shell/e-shell.c:1647
+#: shell/e-shell.c:1648
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "PaПto nustatymo meistras"
 
-#: shell/e-shell.c:1649 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
@@ -11343,47 +11376,51 @@ msgstr "TrumpКs"
 msgid "(No name)"
 msgstr "(Be pavadinimo)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "NКra klaidЬ"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat pavadinimu"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "NeuЧtenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Funkcija neАgyvendinta Пioje saugykloje"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas Пioje saugykloje nepalaikomas"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:511
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nurodytas aplankas nerastas"
 
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
 #: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
@@ -12578,7 +12615,7 @@ msgstr "UЧПifruoti ПА laiПkЮ su PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 #, fuzzy
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "UЧПifruoti ПА laiПkЮ tavo S/MIME пifravimo sertifikatu"
 
 #: ui/evolution-message-composer.xml.h:8
@@ -13346,6 +13383,9 @@ msgstr "init_corba(): negalКjau inicializuoti GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 
+#~ msgid "RDF Summary"
+#~ msgstr "RDF apЧvalga"
+
 #~ msgid "USA"
 #~ msgstr "JAV"
 
diff --git a/po/nl.po b/po/nl.po
index 5f7f820eed..bea8a07e5b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,10 +6,11 @@
 # Almer S. Tigelaar <almer@gnome.org>, 2000, 2001
 # Dirk-Jan C. Binnema <dirkjan@gnome.org>, 2001
 # Mendel Mobach <mendel@mobach.nl>, 2001
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -25,11 +26,11 @@ msgstr "Fabriek om GnomeCard bestanden importeren in Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importeert GnomeCard bestanden naar Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Kaart: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -37,7 +38,7 @@ msgstr ""
 "\n"
 "Naam: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -45,7 +46,7 @@ msgstr ""
 "\n"
 "  Voorvoegsel:      "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -53,7 +54,7 @@ msgstr ""
 "\n"
 "  Gegeven:      "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -61,7 +62,7 @@ msgstr ""
 "\n"
 "  Extra: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -69,7 +70,7 @@ msgstr ""
 "\n"
 "  Familie:      "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -77,7 +78,7 @@ msgstr ""
 "\n"
 "  Achtervoegsel:      "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -85,7 +86,7 @@ msgstr ""
 "\n"
 "Geboortedatum: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -93,7 +94,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -101,7 +102,7 @@ msgstr ""
 "\n"
 "  Postbus:  "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -109,7 +110,7 @@ msgstr ""
 "\n"
 "  Ext:           "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -117,7 +118,7 @@ msgstr ""
 "\n"
 "  Straat:      "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -125,7 +126,7 @@ msgstr ""
 "\n"
 "  Plaats:        "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -133,7 +134,7 @@ msgstr ""
 "\n"
 "  Regio:      "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -141,7 +142,7 @@ msgstr ""
 "\n"
 "  Postcode: "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -149,7 +150,7 @@ msgstr ""
 "\n"
 "  Land:      "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -157,7 +158,7 @@ msgstr ""
 "\n"
 "Afleveringslabel: "
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -165,7 +166,7 @@ msgstr ""
 "\n"
 "Telefoons:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -173,7 +174,7 @@ msgstr ""
 "\n"
 "Telefoon:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -181,7 +182,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -189,7 +190,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -197,7 +198,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -205,7 +206,7 @@ msgstr ""
 "\n"
 "Tijdzone: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -213,7 +214,7 @@ msgstr ""
 "\n"
 "Geografische Locatie: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -221,7 +222,7 @@ msgstr ""
 "\n"
 "Bedrijfsrol: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -229,7 +230,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -237,7 +238,7 @@ msgstr ""
 "\n"
 "  Naam:   "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -245,7 +246,7 @@ msgstr ""
 "\n"
 "  Eenheid:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -253,7 +254,7 @@ msgstr ""
 "\n"
 "  Eenheid2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -261,7 +262,7 @@ msgstr ""
 "\n"
 "  Eenheid3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -269,7 +270,7 @@ msgstr ""
 "\n"
 "  Eenheid4: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -277,7 +278,7 @@ msgstr ""
 "\n"
 "CategorieКn: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -295,7 +296,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -303,7 +304,7 @@ msgstr ""
 "\n"
 "Unieke Tekenreeks: "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -324,8 +325,8 @@ msgstr "Vkaart voor %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -340,20 +341,20 @@ msgstr "Cursor kon niet worden geladen\n"
 msgid "EBook not loaded\n"
 msgstr "EBook niet geladen\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Kon \"wombat\" niet starten"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Kon de adresgegevens niet uit de pilot lezen"
 
@@ -401,196 +402,206 @@ msgstr "Fabriek voor het Evolution adresboek component."
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "C_ontacten...."
 
-#: 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-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Fout bij het laden van filterinformatie:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Onbekende aanmeldingstype"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Nieuw contact"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Basis"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Nieuw contact"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Een"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Nieuw contact"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Subboom"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Nieuw contact"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Onbekend bereiktype"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Bewerk Adresboek"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr ""
 
-#: 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.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Account"
 
-#. 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.glade.h:3
+msgid "Add Addressbook"
+msgstr "Adresboek Toevoegen"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "Computernaam:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Adresboekbronnen"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Computernaam help tekst hier."
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Uitgebreid..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Stam DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Basis"
 
-#: 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.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Basis"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Poort:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "Verwijderen"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Poort help tekst hier."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "Een"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 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.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Zoekbereik:"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Pad Help tekst hier"
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "Selecteer namen"
 
-#: 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.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Zo"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "Bewerk Adresboek"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "Adresboek Toevoegen"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"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.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: 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:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Adresboekbronnen"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "Accountbeheer"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "B_ewerken..."
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Server vereist aanmelding"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Poort:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Server Bericht:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 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:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Voor uw wachtwoord in voor %s"
+
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Aanmelding"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "E-mailadres:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Wachtwoord"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Kan het adresboek niet openen"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -600,7 +611,7 @@ msgstr ""
 "u een ongeldige URI heeft opgegeven of de LDAPserver\n"
 "down is."
 
-#: addressbook/gui/component/addressbook.c:385
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -612,7 +623,7 @@ msgstr ""
 "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
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -620,42 +631,67 @@ msgstr ""
 "Kan het adressenboek niet openen.  Controleer of het pad bestaat\n"
 "en of u het mag benaderen."
 
-#: addressbook/gui/component/addressbook.c:554
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Elk veld bevat"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Naam bevat"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "E-mail bevat"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "Naam bevat"
+msgid "Category is"
+msgstr "CategorieКn"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Uitgebreid..."
 
-#: addressbook/gui/component/addressbook.c:707
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Categorie:"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Mapbladeraar zal laten zien"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Geen naam)"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "E-mail 3"
 
@@ -679,19 +715,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "Bewerk Adresboek"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Bewerk Contactinformatie"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Toevoegen aan contacten"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "E-mailadres:"
@@ -713,13 +749,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -731,37 +764,56 @@ msgstr "Alle Verwijderen"
 msgid "Send HTML Mail?"
 msgstr "HTLM email versturen?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Andere Contacten"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Geaddresseerden"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "bevat"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Selecteer namen"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "C_ontacten...."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "Selecteer naam van:"
+msgid "F_ind"
+msgstr "Zoek"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "Selecteer namen"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, 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/gui/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "_Map"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Geaddresseerden"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -776,8 +828,8 @@ msgid "Business _Fax"
 msgstr "Bedrijfs_fax"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorieКn..."
 
@@ -786,16 +838,16 @@ msgid "Contact Editor"
 msgstr "Contacten Bewerken"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Details"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Opslaan Als:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Algemeen"
 
@@ -820,239 +872,1240 @@ msgstr "Telefoontypes"
 msgid "Wants to receive _HTML mail"
 msgstr "Bij voorkeur _HTML-berichten"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Homepage:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Adres..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "_Assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "Ge_boortedatum:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Werk"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "C_ontacten..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "Af_deling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Volledige Naam..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "PrivИ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_Functie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "_Manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Mobiele Telefoon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Bijnaam:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "Kant_oor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Beroep:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_Echtgeno(o)t(e):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "Dit is een email-adres"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Homepage:"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot deze categoriКen:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Zakelijk"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Bedrijfsfax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Terugbel"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Bedrijf"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Thuis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Thuis 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Mobiele Telefoon"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Overige"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Andere Fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Pieper"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Eerste"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Kon samenvattingsbestand van map `%s' niet verwijderen: %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Contact snel toevoegen"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Volledig bewerken"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Volledige Naam:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "E-mail"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adres _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Assistent"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Automatisch"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "OriКntatie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "Augustus"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "jaren"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Grootte"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Aan het Verzenden"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Voorzitter"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Controleer Adres"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Bestand"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Voorzitter"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Kleuren"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Bezig met kopiКren"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "Verenigde Staten"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Annuleren"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "week"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Algemeen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "uren"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Zondag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Laagste"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Laagste"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "April"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Maart"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Marges"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Mei"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Maandag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Mobiele Telefoon"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Manager"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Nieuwe Berichten"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Selecteer _Gerelateerde Berichten"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Nieuw contact"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nieuwe Berichten"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Hoog"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "April"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minuut"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Nu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Plakken"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Staand"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "na"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Secties:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Score"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Algemeen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr ""
+"Plan\n"
+"Tijd"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normaal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Versturen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Zon"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Bijnaam"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Gelezen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Radio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Taken"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Aan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Vandaag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Din"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Prullenbak"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "(Naamloos)"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Selecteer namen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Gelezen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Plaats:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Postbus:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Staat/Provincie:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_Postcode:"
 
@@ -1143,6 +2196,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Verwijderen"
@@ -1153,7 +2207,7 @@ msgid "contact-list-editor"
 msgstr "Contacten Bewerken"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Contacten Bewerken"
@@ -1163,7 +2217,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1185,26 +2239,31 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "Andere Contacten"
 
 #: 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
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "Uitgebreid zoeken"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1316,42 +2375,52 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: 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:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Openen"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Stuur door als bijvoegsel"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+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: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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Afdrukken"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "Envelop Afdrukken..."
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -1368,7 +2437,8 @@ 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
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -1377,7 +2447,7 @@ msgstr "Onbekende fout"
 msgid "Repository offline"
 msgstr "Werk zonder netwerk"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
@@ -1396,8 +2466,11 @@ msgid "Protocol not supported"
 msgstr "Operatie niet ondersteund"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1428,135 +2501,135 @@ msgstr ""
 "%s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
 "Fout bij lezen gegevens:\n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Klik hier om een contact toe te voegen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Opslaan Als:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Eerste Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Assistent Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Bedrijfstelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "TerugbelTelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "BedrijfsTelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Thuis Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organisatie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Bedrijfs Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Huis Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Mobiele Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Autotelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Bedrijf Telefoon-2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Thuis Telefoon-2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Andere Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Ander Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Afdeling:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Kantoor:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Functie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Beroep"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Echtgenoot/Echtgenote"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Opmerkingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "Vrij/Bezet URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Klaar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "verwijderen map %s"
@@ -1753,6 +2826,23 @@ msgstr "Breedte:"
 msgid "_Font..."
 msgstr "Lettertype..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Druk Kalender af"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Druk Kalender af"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Envelop Afdrukken..."
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1911,7 +3001,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "Kon GNOME niet initialiseren"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Kon Bonobo niet initialiseren"
@@ -1920,149 +3010,140 @@ msgstr "Kon Bonobo niet initialiseren"
 msgid "Could not create the alarm notify service factory"
 msgstr "CreКeren van de alarmnotificatie-dienst is mislukt:"
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %e %B, %Y"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:586
+#: calendar/gui/calendar-commands.c:604
 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:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "Openbaar"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "Openbaar"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "W"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Hoog"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "Normaal"
 
-#: 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Laag"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "week"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Bezig"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Niet Gestart"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "In Uitvoer"
 
-#: 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Voltooid"
 
-#: 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 "Geannuleerd"
-
 #. 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2073,28 +3154,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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: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:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2104,42 +3164,49 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 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:1168
+#: calendar/gui/calendar-model.c:1092
 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:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "De doorzichtigheid moet 'Doorzichtig', 'Ondoorzichtig' of 'Geen' zijn."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Geen"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Nee"
 
@@ -2163,30 +3230,87 @@ msgstr "Defineer Bekijkmogelijkheid"
 msgid "Month View"
 msgstr "Maand"
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "Bondige inhoud bevat"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "Omschrijving:"
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "Commentaar bevat"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Kalender"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Taken"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "VFolder op Mailinglijst"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Maak een nieuwe afspraak"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Nieuwe afspraak"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Nieuwe taak aanmaken"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Nieuwe Taak"
+
 #: 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-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Geluidsalarmen"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Geaddresseerden"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Weergave-instellingen"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2238,121 +3362,127 @@ msgstr "uren"
 msgid "minutes"
 msgstr "minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d dagen"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr " 1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d weken"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr " 1 week"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d uren"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 uur"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minuut"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d seconden"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " 1 seconde"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Speel een geluid af"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Laat volgende bericht zien"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Verstuur een e-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Start een programma"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr " voor het begin van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr " na het begin van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr " voor het eind van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, fuzzy
 msgid "after end of appointment"
 msgstr " na het eind van een afspraak"
 
 #: 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/dialogs/recurrence-page.glade.h:2
 #, fuzzy
 msgid "Basics"
 msgstr "Basis"
 
 #: 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:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Herinneringen"
 
 #: 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
 
@@ -2361,12 +3491,11 @@ msgstr "Samenvatting:"
 msgid "_Options..."
 msgstr "_Opties"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "na"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "voor"
 
@@ -2383,7 +3512,7 @@ msgstr "einde van afspraak"
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minu(u)t(en)"
 
@@ -2400,204 +3529,230 @@ msgid "10 minutes"
 msgstr "10 minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12-uurs (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24-uurs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minuten"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "Postinstellingen..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Piep als het alarm venster verschijnt."
+msgid "Color for tasks due today"
+msgstr ""
 
 #: 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"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Maak een nieuwe afspraak"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "Kalender Instellingen"
+#, fuzzy
+msgid "Days"
+msgstr "Dag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Eerste dag van de week:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "Vrijdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+#, fuzzy
+msgid "Hours"
+msgstr "uren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
-msgid "Compress weekends in month view"
-msgstr "Weekeinden comprimeren"
+msgid "Minutes"
+msgstr "minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "Datumnavigator instellingen"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Maandag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Standaardinstellingen"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Verlopen items"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "Weergave"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "Zaterdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Eind van dag:"
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "Toon afspraak-eindtijden"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "Eerste dag van de week:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Toon weeknummers"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Vrij"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "Begin van dag:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Vrijdag"
+#, fuzzy
+msgid "Su_n"
+msgstr "Zon"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Zondag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "Maa"
+#, fuzzy
+msgid "T_hu"
+msgstr "Don"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Maandag"
+#, fuzzy
+msgid "T_ue"
+msgstr "Din"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Items die vandaag verlopen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "Verlopen items"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Donderdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Herinner me aan alle afspraken"
+#, fuzzy
+msgid "Time"
+msgstr "Functie"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"Tijdzone: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "Zat"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Tijddelingen:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "Zaterdag"
+msgid "Time format:"
+msgstr "Tijdsformaat:"
 
 #: 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/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Dinsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Toon weeknummers"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Woensdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "Begin van dag:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "Werkweek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "Zon"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12-uurs (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Zondag"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24-uurs"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "Taken"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "Items die vandaag verlopen"
+msgid "_Compress weekends in month view"
+msgstr "Weekeinden comprimeren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "Don"
+#, fuzzy
+msgid "_Display"
+msgstr "Weergave"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Donderdag"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Eind van dag:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "Functie"
+msgid "_Fri"
+msgstr "Vrij"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Tijddelingen:"
+#, fuzzy
+msgid "_General"
+msgstr "Algemeen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Tijdsformaat:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Verberg verwijderde"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"Tijdzone: "
+msgid "_Mon"
+msgstr "Maa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "Din"
+#, fuzzy
+msgid "_Other"
+msgstr "Overige"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Dinsdag"
+#, fuzzy
+msgid "_Sat"
+msgstr "Zat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "Woe"
+#, fuzzy
+msgid "_Task List"
+msgstr "Taken"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Woensdag"
+#, fuzzy
+msgid "_Wed"
+msgstr "Woe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
-msgid "Work Week"
-msgstr "Werkweek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "minuten voordat ze plaatsvinden."
+msgid "before the start of the appointment"
+msgstr " voor het begin van een afspraak"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2662,64 +3817,59 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Verloop Datum"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboekelement - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2727,12 +3877,12 @@ 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Opslaan Als..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2778,44 +3928,35 @@ 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/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Selecteer een bestand"
+msgid "Addressbook..."
+msgstr "Adresboek"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "Secties:"
+msgid "Delegate To:"
+msgstr "Verwijderd"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-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 ""
+msgid "Enter Delegate"
+msgstr "Verwijderd"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Herhaling"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "Afspraak annuleren"
@@ -2824,174 +3965,190 @@ msgstr "Afspraak annuleren"
 msgid "A_ll day event"
 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/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Bezig"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classificatie"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Vertrouwelijk"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Datum & Tijd"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "week"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vИ"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Open_baar"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Weergeven"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "Sa_menvatting:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_Vertrouwelijk"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "_Eindtijd:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "Vereiste Deelnemer"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Optionele Deelnemer"
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Voorlopig"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Verwijderd"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "In Uitvoer"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Vereiste Deelnemer"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Optionele Deelnemer"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Niet-Deelnemer"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Verzonden"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Verwijderen..."
@@ -3034,19 +4191,18 @@ 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
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: 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"
@@ -3091,13 +4247,14 @@ msgstr "op de"
 msgid "th"
 msgstr "e"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 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:1
+#, fuzzy
+msgid "A_dd"
+msgstr "Toevoegen"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3108,26 +4265,33 @@ msgid "Exceptions"
 msgstr "Uitzonderingen"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "No recurrence"
-msgstr "Geen herhaling"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Herhalingsregel"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Eenvoudige herhaling"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Aangepaste herhaling"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Aanpassen"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Geen herhaling"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Eenvoudige herhaling"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "voor"
@@ -3169,166 +4333,162 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Vo_ltooid:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "Verwijderd"
+msgid "Date Completed:"
+msgstr "Voltooiingsdatum:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "Geen"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "Voortgang"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "_Taak"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_Prioriteit:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Vo_ltooid:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "Voortgang"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Toegewezen"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Omschrijving:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Be_gindatum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Vertrouwelijk"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Verloopdatum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "_Prioriteit:"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "_Status:"
-
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: 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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Markeer de taak als voltooid"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Verwijder deze taak"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Markeer de taak als voltooid"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Verwijder de geselecteerde taken"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
 
-#: 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"
@@ -3362,23 +4522,23 @@ msgstr "Geografische Positie"
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Begindatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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"
@@ -3390,155 +4550,264 @@ 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:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Gebeurtenis die de gehele dag plaatsvindt"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ga Naar Vandaag"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Ga Naar Datum"
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Verwijder deze afspraak"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Maak deze Gebeurtenis Verplaatsbaar"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "Dit is een email-adres"
+msgid "Meeting Information"
+msgstr "Optionele Informatie"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 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:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Afspraak annuleren"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "_Einde bijeenkomst:"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:633
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Dit bericht is nu niet beschikbaar"
+msgid "Meeting Update Request"
+msgstr "Ve_rzoek Bijeenkomst (FIXME)"
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "Dit is een email-adres"
+
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Afspraak annuleren"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Selecteer een bestand"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Vind in bericht"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Informatie"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "TaakBlad"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "was na"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "Taakve_rzoek (FIXME)"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Beantwoorden"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "De map lijkt onherstelbaar beschadigd te zijn."
+msgid "Task Cancellation"
+msgstr "Afspraak annuleren"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Kalenderbericht"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Vereisde informatie"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Vereisde informatie"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "Vrij/Bezet URL"
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "Vrij/Bezet URL"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Vorige bericht"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kon uw kalender bestand niet updaten!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Voltooiingsdatum:"
+
+#: calendar/gui/e-itip-control.c:967
 #, 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.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% Vo_ltooid:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Verzendingsdatum"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3576,44 +4845,27 @@ msgstr "einddatum"
 msgid "date-start"
 msgstr "begindatum"
 
-#: 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:252
-msgid "Category:"
-msgstr "Categorie:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kon de taken in `%s' niet laden"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, 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"
 
-#. 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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nieuwe Afspraak..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, 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"
@@ -3639,43 +4891,43 @@ msgid "Go To Date"
 msgstr "Ga Naar Datum"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Maart"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Mei"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Oktober"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "Ga Naar Vandaag"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3831,12 +5083,6 @@ msgstr "Vr"
 msgid "Sa"
 msgstr "Za"
 
-#: 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:1815
 #, fuzzy
@@ -3873,9 +5119,8 @@ msgid "Print Calendar"
 msgstr "Druk Kalender af"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
@@ -3889,7 +5134,7 @@ msgstr "Item afdrukken"
 msgid "Print Setup"
 msgstr "Printerinstellingen"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "De URI van de te tonen takenmap"
 
@@ -3935,6 +5180,106 @@ 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr "time-add-day verwacht 2 argumenten"
+
+#: calendar/pcs/query.c:289
+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:296
+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:323
+msgid "time-day-begin expects 1 argument"
+msgstr "time-day-begin verwacht 1 argument"
+
+#: calendar/pcs/query.c:328
+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:355
+msgid "time-day-end expects 1 argument"
+msgstr "time-dat-end verwacht 1 argument"
+
+#: calendar/pcs/query.c:360
+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:396
+msgid "get-vtype expects 0 arguments"
+msgstr "get-vtype verwacht geen argumenten"
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr "occur-in-time-range? verwacht 2 argumenten"
+
+#: calendar/pcs/query.c:497
+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:504
+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:634
+msgid "contains? expects 2 arguments"
+msgstr "Bevat? verwacht 2 argumenten"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr "contains? verwacht dat argument 1 een string is"
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr "contains? verwacht dat argument 2 een string is"
+
+#: calendar/pcs/query.c:663
+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:705
+msgid "has-categories? expects at least 1 argument"
+msgstr "has-categories? verwacht op zijn minst 1 argument"
+
+#: calendar/pcs/query.c:717
+#, fuzzy
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr "has-categories? verwacht dat alle argumenten strings zijn"
+
+#: calendar/pcs/query.c:805
+#, fuzzy
+msgid "is-completed? expects 0 arguments"
+msgstr "time-now verwacht 0 argumenten"
+
+#: calendar/pcs/query.c:1008
+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"
@@ -3992,6 +5337,7 @@ msgid "Unable to process spool folder"
 msgstr "Kan de spoolmap niet verwerken"
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ophalen bericht %d(%d%%)"
 
@@ -4028,7 +5374,7 @@ msgstr "Fout bij interpreten bestand: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filterzoekactie: %s: %s"
@@ -4055,12 +5401,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bezig met uitvoeren van zoekopdracht op onbekende kop: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ongeldig type in bericht-bevat, verwacht een tekenreeks"
 
@@ -4176,13 +5522,13 @@ msgid "No plaintext to sign."
 msgstr "geen plaintext om te signeren"
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Geen wachtwoord ingevoerd."
 
 #: 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kon de pijp naar GPG/PGP niet maken: %s"
@@ -4200,15 +5546,15 @@ msgstr "geen plaintext om te controleren"
 msgid "Couldn't create temp file: %s"
 msgstr "Kon tijdelijk bestand niet maken: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "Geen plaintext om te encrypten"
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Geen ontvangers gespecifieerd"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr "geen ciphertext om te decoderen."
 
@@ -4242,7 +5588,7 @@ msgid "Connection cancelled"
 msgstr "Verbinding geannuleerd"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kon niet verbinden met %s (poort %d): %s"
@@ -4253,7 +5599,7 @@ msgstr "(onbekende machine)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
@@ -4355,8 +5701,8 @@ msgstr "Kerberos 4"
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Deze optie zal bij het verbinden met de server gebruik maken van "
-"Kerberos-4-aanmelding."
+"Deze optie zal bij het verbinden met de server gebruik maken van Kerberos-4-"
+"aanmelding."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -4386,42 +5732,69 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Onbekende aanmeldingsstatus"
 
+#: 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:54
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Bronnen"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compileren van reguliere expressie mislukt: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' heeft een gebruikersnaamcomponent nodig"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' heeft een machinenaamcomponent nodig"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' heeft een padcomponent nodig"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving \"%s\""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fout bij opzoeken naam: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Machine niet gevonden: %s machine niet gevonden"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Machine opzoeken faalde: %s onbekende reden"
@@ -4434,12 +5807,12 @@ msgstr "Virtuele map e-mail-aanbieder"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Voor het lezen van post als een zoekopdracht op een verzameling mappen"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Geen aanbieder beschikbaar voor protocol `%s'"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4486,7 +5859,7 @@ msgstr "Faalde bij bericht %d"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4496,7 +5869,7 @@ msgstr ""
 "Onderwerp: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4549,61 +5922,61 @@ 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-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Onverwacht antwoord van IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-commando mislukt: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "Het antwoord van de server eindigde te snel."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, 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:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, 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:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Bezig met het opslaan van berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Bezig met het opslaan van berichten"
@@ -4617,7 +5990,7 @@ msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 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
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Controleren voor nieuwe email"
 
@@ -4625,7 +5998,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Mappen"
 
@@ -4665,7 +6038,7 @@ 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:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Geen ondersteuning voor aanmeldingstype %s"
@@ -4676,7 +6049,7 @@ 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:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
@@ -4691,12 +6064,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4788,7 +6161,7 @@ msgstr "Kan bericht niet toevoegen aan maildir-map: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4802,7 +6175,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4875,20 +6248,20 @@ msgstr "Kon maildir directory path niet openen: %s: %s"
 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-mbox-folder.c:209
 #: 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"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 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-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4900,12 +6273,12 @@ msgstr ""
 "Kan bericht %s uit folder %s niet verkrijgen\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
@@ -4953,13 +6326,14 @@ msgstr "Map `%s' is niet leeg. Niet verwijderd."
 #. 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"
+#, fuzzy
+msgid "Summarizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing 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
@@ -4969,24 +6343,22 @@ 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"
+#, fuzzy, c-format
+msgid "Cannot summarize 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
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "Kon map %s niet openen voor genereren van samenvatting: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5090,6 +6462,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: 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-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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5183,39 +6566,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Het .newsrc-bestand kon niet geopend of gemaakt worden voor %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "POP-samenvatting aan het ophalen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Kon de POP server niet controleren op nieuwe berichten: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Kon map niet openen: berichtenlijst was onvolledig."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "Geen bericht met uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Bezig met ophalen POP-bericht %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Kon bericht niet ophalen: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kon bericht niet van POP server %s halen: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "Geen bericht met uid %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Bezig met ophalen POP-bericht %d"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Berichtenopslag"
@@ -5229,7 +6612,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:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5246,9 +6629,9 @@ msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"Bij het verbinden met de POP-server het wachtwoord versturen in "
-"platte-tekst-vorm. Deze optie is de enige die wordt ondersteund door de "
-"meeste POP servers."
+"Bij het verbinden met de POP-server het wachtwoord versturen in platte-tekst-"
+"vorm. Deze optie is de enige die wordt ondersteund door de meeste POP "
+"servers."
 
 #: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
@@ -5324,7 +6707,7 @@ msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5378,7 +6761,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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5388,122 +6771,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:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Syntactische fout, commando niet herkend"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntactische fout in parameters of argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Commando niet geОmplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "Commando-parameter niet geОmplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr "Systeem-status, of systeem-help-antwoord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Helpbericht"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Dienst is gereed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Dienst heeft transmissiekanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst niet beschikbaar, transmissiekanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "Postopdracht geslaagd, voltooid"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 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:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Postopdracht niet uitgevoerd: postbus niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Opdracht niet uitgevoerd: postbus niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "Verzochte actie afgebroken: fout tijdens verwerken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "Gebruiker niet lokaal; probeer <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Opdracht niet uitgevoerd: onvoldoende ruimte op systeem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Postopdracht afgebroken: gebruikt teveel ruimte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Opdracht niet uitgevoerd: postbusnaam niet toegestaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start postinvoer; eindig met <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Transactie mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "Veranderen van wachtwoord is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "Aanmeldingsmechanisme te zwak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Versleuteling vereist voor gewenst aanmeldingsmechanisme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Tijdelijke aanmeldingsfout"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Aanmelding is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, 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:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5514,129 +6897,129 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Postaflevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan bericht niet versturen: afzender niet gedefiniКerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Bezig met versturen bericht"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "Afspraak annuleren"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "'HELO respons'- fout: %s: niet-fataal"
 
-#: 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:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Aanmelding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr "Fout bij aanmaken van SASL aanmeldingsobject"
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr "AUTH verzoek faalde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "Fout aanmeldingsantwoord van server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, 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:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Fout bij RSET-respons: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, 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:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Fout bij QUIT-respons: %s: niet-fataal"
@@ -5666,7 +7049,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "bijlage"
 
@@ -5699,52 +7082,52 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Van:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Antwoordadres:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Aan:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 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
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5773,30 +7156,30 @@ msgid ""
 "%s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Waarschuwing"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5804,17 +7187,17 @@ msgstr ""
 "Kan de drafts map voor die account niet openen.\n"
 "Wilt u gebruik maken van de standaardmap?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van POP server %s halen: %s"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5823,7 +7206,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5832,7 +7215,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5841,16 +7224,16 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 #, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution heeft Pine mailbestanden gevonden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5860,25 +7243,25 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "Tekstbestand invoegen..."
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Stel een nieuw bericht op"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr ""
 "Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
@@ -5909,57 +7292,103 @@ msgstr "adreskaart"
 msgid "calendar information"
 msgstr "kalenderinformatie"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "bevat"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "bevat niet"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "Commentaar bevat"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Naam bevat"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Geadresseerden"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Naam bevat"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Naam bevat"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "bevat niet"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d-%m-%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %d-%m-%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5967,13 +7396,13 @@ 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
+#: e-util/e-time-utils.c:313
 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
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
@@ -6071,7 +7500,7 @@ msgstr "Een tijd relatief aan de huidige tijd"
 msgid "Compare against"
 msgstr "Vergelijk tegen"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "nu"
 
@@ -6083,11 +7512,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<klik hier om een datum te selecteren>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Filterregels"
 
@@ -6108,20 +7541,20 @@ 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:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Voer een Map-URI in"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6142,62 +7575,51 @@ msgstr "Regel naam: "
 msgid "Untitled"
 msgstr "Geen Titel"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Als"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Acties uitvoeren"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "als aan alle criteria wordt voldaan"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "als aan een van de criteria wordt voldaan"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Criteria toevoegen"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "inkomend"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Filters Bewerken"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Bewerk VMappen"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Inkomend"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Uitgaand"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuele Mappen"
 
@@ -6221,194 +7643,195 @@ msgstr "met alle lokale en actieve niet-lokale mappen"
 msgid "with all local folders"
 msgstr "met alle lokale folders"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Geef Kleur"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Geef Score"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Bijlages"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "bevat"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Ontvangstdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Verzendingsdatum"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "bevat niet"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "eindigt niet op"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "klinkt niet als"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "begint niet met"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Klad"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "eindigt op"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Bestaat"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "bestaat"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Belangrijk"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "is"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "is groter dan"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "is kleiner dan"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "is niet"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Mailinglijst"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Berichtinhoud"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "Berichtkop"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "Bericht werd ontvangen"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "Bericht werd verzonden"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "op of na"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "op of voor"
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Gelezen"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Geadresseerden"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Afzender"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Stel Status in"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Grootte"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "klinkt als"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Source-Account"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "begint met"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Onderwerp"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "bevat"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "bevat niet"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "eindigt niet op"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "bestaat niet"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "klinkt niet als"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "begint niet met"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "eindigt op"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "bestaat"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "is groter dan"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "is kleiner dan"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "is niet"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "is"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "op of na"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "op of voor"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "klinkt als"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "begint met"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "was na"
@@ -6438,14 +7861,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importeer"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Post"
 
@@ -6473,11 +7895,11 @@ msgstr ""
 "Evolution heeft GnomeCard bestanden geovnden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Instellingen:"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6533,169 +7955,190 @@ msgstr "Fabriek voor het post-samenvattingscomponent."
 msgid "Mail configuration interface"
 msgstr "Mail configuratie interface"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "VFolder op Mailinglijst"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "_Eigenschappen..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "De bestandseigenschappen wijzigen"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "_Bericht versturen"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "_Bericht versturen"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan het Evolution Mail-component niet initialiseren."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschappen voor \"%s\""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "Maak Filter Van Bericht"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "VFolder op Mailing_Lijst"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Filter op Afzen_der"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr " Filter op Mailinglijst"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "Laatste"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "Bericht afdrukken..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_Opslaan Als..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Afzender beantwoorden"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Markeer Als Gelezen"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Markeer Als Ongelezen"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Belangrijk"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Markeer Als Ongelezen"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_Verplaatsen naar Map..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_KopiКren naar Map..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Herstellen"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Adresboek Toevoegen"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "Creeer Regel Van Bericht"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filter op Mailinglijst"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "VFolder op Mailinglijst"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter op Mailinglijst (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VMap op Mailinglijst (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Optionele Informatie"
+
 #: 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"
@@ -6758,16 +8201,16 @@ msgid "Evolution News Editor"
 msgstr "Evolution Accountbewerker"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbewerker"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Handtekeningbestand:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6778,40 +8221,45 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (standaard)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Uitzetten."
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Aanzetten"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "Weet u zeker dat u deze account wilt verwijderen?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Verwijderen"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "Stel dit in als standaardaccount"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 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 Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Evolution Accountbeheer"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "Postinstellingen..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6865,11 +8313,11 @@ msgstr ""
 "U moet een post-transport configureren\n"
 "voordat u e-mail kunt versturen."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post-transportmethode ingesteld"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6877,7 +8325,7 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6885,38 +8333,37 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 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:410
+#: mail/mail-callbacks.c:390
 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:653
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "Op %s, %s schreef:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Doorgestuurd bericht:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Kopieer bericht(en) naar"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, 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:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6924,7 +8371,7 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6932,24 +8379,41 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, 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:1463
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "Geen bericht geselecteerd"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Dit bericht niet meer weergeven."
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6958,61 +8422,71 @@ msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, 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-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "Voor uw naam en emailadres in. De optionele velden behoeven niet te "
 "wordeningevuld tenzij u wilt dat deze informatie wordt meegezondenin de "
 "email berichten die u verzend."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Voor de informatie over de inkomende emailserver in. Als u niet weet wat "
 "voor server ugebruikt neem dan contact op met uw system administrator of met "
 "uw ISP."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Voer informatie omtrent je uitgaand e-mail protocol beneden in. Als je niet "
 "weet voor protocol u gebruikt neem dan contact op met uw system "
 "administrator of met uw Internet Service Provider"
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "U bent bijna klaar met het emailconfiguratie proces. De identiteit, "
 "incomende emailserver en uitgaande verzend methode die u heeft "
@@ -7021,80 +8495,87 @@ msgstr ""
 "word alleengebruik als 'show' naam."
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Evolution Accountwizard"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Verbinden met server....."
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr "Detecteer ondersteunde types..."
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr "Kleuren"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, 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
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Accountinformatie"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Accountbeheer"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Accounts"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: 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:9
+msgid "Always sign outgoing messages when using this account"
+msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Aanmelding"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Aanmeldingstype:"
 
-#: 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:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Opstellen"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7110,281 +8591,257 @@ msgstr ""
 "\n"
 "Klik op \"Voltooien\" om uw instellingen op te slaan."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Default Forward style is: "
 msgstr "Standaard doorsturen stijl is:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:24
 #, fuzzy
-msgid "Default character set: "
+msgid "Default character encoding: "
 msgstr "Standaard doorsturen stijl is:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Weergave"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Klaar"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Klad"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Klad map"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Bewerken..."
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "E_nable"
+msgstr "Aanzetten"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "E-mailadres:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Sla het huidige bestand op onder een andere naam"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Bewerken..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "Aanzetten"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Volledige Naam:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "Handtekeningbestand:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr "Highligt citaten met"
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identiteit"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "in HTML email"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Ingebonden"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: 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:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Postconfiguratie"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, 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:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "Markeer berichten als \"Gelezen\" na: "
+msgid "Make this my _default account"
+msgstr "Stel dit in als standaardaccount"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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:60
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Nieuws"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Optionele Informatie"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Organisatie:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr "Locatie van PGP:"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Prompt when sending messages with an empty subject"
+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
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail-maildir"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Ontvang opties"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Vereisde informatie"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Selecteer een bestand"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Selecteer lokatie PGP"
 
-#: 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:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Berichten aan het versturen"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Bezig met versturen Post"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Verzonden"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Verzonden en kladberichten"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Verzonden berichtenmap"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Serverconfiguratie"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Servertype: "
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "Server vereist aanmelding"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Handtekeningbestand:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Bronnen"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Geen informatie"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Bronnen"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Speciale Mappen"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Standaard Unix mailboxbestand"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use secure connection (_SSL)"
 msgstr "Deze server vereist een beveiligde verbinding (SSL)"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7392,15 +8849,122 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "_Always load images off the net"
+msgstr "Altijd plaatjes van buiten het netwerk laden"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "Automatisch controleren op nieuwe post elke"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr "Detecteer ondersteunde types..."
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "E-mailadres:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Volledige Naam:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "Handtekeningbestand:"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "Highligt citaten met"
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "Computernaam:"
+
+#: mail/mail-config.glade.h:102
+#, fuzzy
+msgid "_Load images if sender is in addressbook"
+msgstr "Plaatjes laden als de afzender in het adresboek voorkomt"
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "Markeer berichten als \"Gelezen\" na: "
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "Naam:"
+
+#: mail/mail-config.glade.h:106
+#, fuzzy
+msgid "_Never load images off the net"
+msgstr "Nooi plaatjes van het net afhalen"
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Organisatie:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "Locatie van PGP:"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Pad:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Onthoud dit wachtwoord"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Stuur post standaard in HTML-formaat."
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Handtekeningbestand:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Gebruikersnaam:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "seconden."
 
@@ -7443,184 +9007,195 @@ msgstr "Kon geen S/MIME encryptie context maken"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kon geen S/MIME decryptie context maken"
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Bijlage Opslaan"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Opslaan op Schijf..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Geef Ingebonden Weer (via %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Extern Weergave Programma"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Bezig met laden berichtinhoud"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Open link in browser"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Kopieer locatie (FIXME)"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Sla op als (FIXME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Opslaan als..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, fuzzy, c-format
 msgid "%d new"
 msgstr " %d minuten"
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Verwijderd"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d seconden"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Laat zien als source"
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "E-mailadres:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Van"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr "Antwoordadres:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Aan"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "Geen GPG/PGP programma geconfigureerd"
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "Versleutelde berichten worden niet weergegeven"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Klik op het pictogram om te ontsleutelen."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 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:1388
+#: mail/mail-format.c:1403
 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:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, 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:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte"
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Map `%s' bestaat niet."
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Bezig met openen '%s'"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7629,7 +9204,7 @@ msgstr ""
 "Kan map-metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7637,12 +9212,12 @@ msgstr ""
 "Als deze map niet meer kan worden geopend, dan is\n"
 "het wellicht noodzakelijk om deze handmatig te repareren."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, 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
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Configureer %s"
@@ -7665,104 +9240,129 @@ msgstr ""
 "Fout tijden het uitvoeren van bewerking:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Onthoud dit wachtwoord"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Bezig"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Map wordt ververest"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Berichten aan het ontvangen"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bezig met verzenden bericht %d van %d"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "faalde op bericht %d van %d"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Voltooid."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "Bezig met opslaan bericht in map"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Bezig met verplaatsen van berichten naar %s"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Bezig met het kopiКren van berichten naar %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Bezig met kopiКren"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Bezig met aanmaken van nieuwe map"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Bezig met synchroniseren map"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Map wordt ververest"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Bezig met ophalen berichten"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Bezig met het opslaan van berichten"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7771,7 +9371,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7780,11 +9380,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7793,79 +9393,75 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Zoeken"
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(Naamloos)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(Naamloos)"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "Bericht"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "Vind in bericht"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr "Zoek doorgestuurde"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Zoek:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Klopt:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "annuleren ..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Versturen en ontvangen van berichten"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Aan het ontvangen"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "Aan het Actualiseren ..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "Aan het Wachten ..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "Aan het Verzenden"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr "Gebruiker heeft operatie afgebroken."
 
@@ -7884,82 +9480,88 @@ msgstr "Doorgestuurd bericht - %s"
 msgid "Forwarded message"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Fwd: (geen onderwerp)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "Bericht"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "Laagste"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Laag"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "Hoog"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "Hoogste"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Vandaag %l:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "Bezig met het opslaan van berichten"
 
 #: mail/message-list.etspec.h:2
@@ -7974,38 +9576,78 @@ msgstr "Ontvangen"
 msgid "Size"
 msgstr "Grootte"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Map"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "Opslag"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Geef mappen weer die beginnen met:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Bezig met verkrijgen opslag voor \"%s\""
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Bezig met aanmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Bezig met afmelden van map \"%s\""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Map"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "Geen bericht geselecteerd"
+
+#: mail/subscribe-dialog.c:1547
+#, fuzzy
+msgid "Please select a server."
+msgstr "Selecteer een service"
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Lijst Verversen"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Selecteer Map"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Weergave-instellingen"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "Beheer Postbusabonnementen..."
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Abonneren"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Afmelden"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Evolution-component voor de samenvatting."
@@ -8014,54 +9656,71 @@ msgstr "Evolution-component voor de samenvatting."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Fabriek voor het Evolution-samenvattingscomponent."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 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
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Afspraken"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Toon afspraken"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M %p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Samenvatting"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Naam:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Evolution"
+msgid "Summary Settings"
+msgstr "Bondige inhoud bevat"
 
 #: my-evolution/e-summary-rdf.c:281
 #, fuzzy
@@ -8073,7 +9732,12 @@ msgstr "Er is een fout opgetreden tijdens het laden van het kalender bestand."
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fout bij laden van kalender</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Instellingen:"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Toon taken"
@@ -8082,28 +9746,33 @@ msgstr "Toon taken"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Overige"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Secties:"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
-msgstr "%A, %e %B, %Y"
+msgid "%A, %B %e %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"
+msgid "Print Summary"
+msgstr "Samenvatting"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "Afdrukken van bericht mislukt"
 
 #: my-evolution/main.c:52
@@ -8111,6 +9780,42 @@ msgstr "Afdrukken van bericht mislukt"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Lettertypen"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Bezig met verplaatsen"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Filters"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "Filters"
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9302,130 +11007,146 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Beantwoord"
+msgid " _Remove"
+msgstr "Verwijderen"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Selecteer Map"
+msgid "Add n_ew feed"
+msgstr "Beantwoord"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Alle Aanwezigen"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "Alle Aanwezigen"
+msgid "All _folders:"
+msgstr "Selecteer Map"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Geef mappen weer die beginnen met:"
+msgid "All news _feeds:"
+msgstr "Beantwoord"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Weergave-instellingen"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "Weergave"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
 #, fuzzy
-msgid "Five days"
-msgstr "Vrijdag"
+msgid "News Feed Settings"
+msgstr "Instellingen:"
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "maand"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr " 1 week"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
 #, fuzzy
-msgid "News Feed Settings"
-msgstr "Instellingen:"
+msgid "Show _all tasks"
+msgstr "Toon taken"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "Toon taken"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr " 1 dag"
+msgid "Tasks "
+msgstr "Taken"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "maand"
+msgid "Units: "
+msgstr ""
+"\n"
+"  Eenheid:  "
 
 #: 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 ""
+msgid "Weather settings"
+msgstr "Selectie wissen"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr ""
-"Plan\n"
-"Tijd"
+msgid "_Display folders:"
+msgstr "Geef mappen weer die beginnen met:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Toon taken"
+msgid "_Display stations:"
+msgstr "Weergave-instellingen"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "Koppen"
+msgid "_Displayed feeds:"
+msgstr "Weergave"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Toon taken"
+msgid "_Five days"
+msgstr "Vrijdag"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "Taken"
+msgid "_Mail"
+msgstr "Post"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  Eenheid:  "
+msgid "_News Feeds"
+msgstr "Instellingen:"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Overige"
+msgid "_One day"
+msgstr " 1 dag"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "Selectie wissen"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "April"
+msgid "_Schedule"
+msgstr ""
+"Plan\n"
+"Tijd"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "Koppen"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Overige"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "April"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9442,7 +11163,17 @@ msgstr "Details"
 msgid "Cancel Operation"
 msgstr "Afspraak annuleren"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Speciale Mappen"
@@ -9495,7 +11226,7 @@ msgid ""
 "`%s'."
 msgstr "Een fout trad op tijdens het openen van het bestand."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9506,7 +11237,7 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9515,7 +11246,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9526,55 +11257,78 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Kan map niet verkrijgen: %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, 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
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, 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:275
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Kopieer naar Map"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, 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:318
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Verplaats naar Map"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Kon map `%s' niet verwijderen:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Verwijder deze map"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, 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
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "verwijderen map %s"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Hernoemen..."
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Mapnaam:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9588,7 +11342,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "De opgegeven mapnaam is niet geldig."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Nieuwe map maken"
 
@@ -9600,11 +11354,11 @@ msgstr ""
 "Het type van de geselecteerde map is niet geldig\n"
 "voor de opdracht."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Nieuw..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Naamloos)"
 
@@ -9644,7 +11398,7 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9693,7 +11447,7 @@ msgstr "Automatisch"
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
@@ -9701,31 +11455,53 @@ msgstr "Selecteer een bestand"
 msgid "File type:"
 msgstr "Bestandstype:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Selecteer Map"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr "Selecteer een doelmap voor deze belangrijke data"
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr "Verbindeingen ophangen...."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Kan het Evolution Mail-component niet initialiseren."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 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:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kon niet worden gestart."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9735,89 +11511,105 @@ msgstr ""
 "programma's voor post, planning en contactbeheer\n"
 "in de GNOME werkomgeving."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Ga naar map..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr "Selecteer de map die je wilt openen"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 #, 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
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "Werk met netwerk"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 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
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution is in bezig offline te gaan."
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 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
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views 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
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "Ongeldige berichtinhoud"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "Kan opslag niet registreren met shell"
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Generieke fout"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Nieuwe snelkoppelingsgroep aanmaken"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Groep:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9826,183 +11618,169 @@ msgstr ""
 "Wil u echt de groep `%s' verwijderen\n"
 "van de snelkoppelingsbalk?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Niet verwijderen"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "_Kleine Pictogrammen"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Toont de snelkoppelingen als kleine pictogrammen"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "_Grote Pictogrammen"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Toont de snelkoppelingen als grote pictogrammen"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Nieuwe Groep..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Deze Groep _Verwijderen..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Deze Groep _Verwijderen..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "_Verberg de Snelkoppelingsbalk"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Verberg de snelkoppelingenbalk"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 #, 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
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Open in Nieuw Venster"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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:479
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, 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
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Geen naam)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Geen fout"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Generieke fout"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Een folder met die naam bestaat reeds"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Het gespecificeerde foldertype is niet geldig"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "I/O fout"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Niet genoeg ruimte vrij om de folder te maken"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder is niet gevonden"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Functie niet geОmplementeerd voor deze opslag"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Operatie niet ondersteund"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 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
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "De opgegeven folder is niet gevonden"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% Vo_ltooid:"
 
@@ -10024,10 +11802,6 @@ msgstr "Computernaam:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Mapnaam:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Maptype:"
@@ -10043,17 +11817,29 @@ msgstr ""
 "Evolution."
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Evolution Import"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Evolution Import"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Selecteer een bestand"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "Welkom bij Evolution Import.\n"
@@ -10074,10 +11860,11 @@ 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 ""
+#, fuzzy
+msgid "Evolution can import data from the following files:"
+msgstr "Evolution-component voor het afhandelen van post"
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10101,10 +11888,10 @@ msgstr ""
 "uitvinden hoe iets voor elkaar te krijgen, dan komt dat waarschijnlijk\n"
 "omdat het nog niet mogelijk is! ;-)\n"
 "We hopen dat Evolution bruikbaar is voor u, maar we moeten u nog steeds\n"
-"waarschuwen dat 'ie kan: crashen, uw mail kwijtraken, processen achterlaten, "
-"\n"
-"100% van uw CPU gebruiken, niet-gestandaardiseerde commando's versturen naar "
-"\n"
+"waarschuwen dat 'ie kan: crashen, uw mail kwijtraken, processen "
+"achterlaten, \n"
+"100% van uw CPU gebruiken, niet-gestandaardiseerde commando's versturen "
+"naar \n"
 "uw servers, en in het algemeen u belachelijk maken bij vrienden en "
 "collega's.\n"
 "Gebruik alleen zoals aangegeven\n"
@@ -10112,7 +11899,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:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10120,25 +11907,30 @@ msgstr ""
 "Bedankt\n"
 "Het Evolution-Team\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Kan de Evolution-schil niet initialiseren."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Kan de Evolution-schil niet initialiseren."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "Sluit splash screen uit"
 
-#: shell/main.c:216
+#: shell/main.c:229
 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:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo-componentensysteem niet initializeren"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "KopiКren"
 
@@ -10155,11 +11947,11 @@ msgstr "Nieuw contact maken"
 msgid "Create new contact list"
 msgstr "Nieuw contact maken"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Knippen"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Knip de selectie"
 
@@ -10167,77 +11959,120 @@ msgstr "Knip de selectie"
 msgid "Delete selected contacts"
 msgstr "Verwijder geselecteerde contacten"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Nieuw contact"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Nieuws"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Plakken"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Geeft een afdrukvoorbeeld van de kalender"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Druk geselecteerde contacten af"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "Verwijder geselecteerde contacten"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Alles Selecteren"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Geef alle contacten weer"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Stuur _bericht aan contact..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "Verwijder geselecteerde contacten"
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Stuur bericht aan contact..."
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "Stuur contact naar ander..."
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Stop met Laden"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "_Acties"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "_Adresboekbronnen"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "C_ontacten...."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 msgstr "C_ontacten...."
 
-#: 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "C_ontacten..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Afdrukken..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Opslaan als VCard"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Zoek naar contacten"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "Alles _Selecteren"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Gereedschap"
 
@@ -10247,112 +12082,131 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "Creeer een nieuw 'hele dag' Event"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Maak een nieuwe afspraak"
+msgid "Create a New _Task"
+msgstr "Nieuwe taak aanmaken"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "Dag"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Verwijder deze afspraak"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ga naar"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Ga terug in de tijd"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Ga vooruit in de tijd"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Ga Naar Datum"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Ga naar een specifieke datum"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Ga naar het heden"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Ga Naar Vandaag"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "Maand"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nieuwe afspraak"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Nieuwe Taak"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Geeft een afdrukvoorbeeld van de kalender"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Druk Kalender af"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Druk deze Kalender af"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Afdruk_voorbeeld"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "Vereisde informatie"
+msgid "Print this calendar"
+msgstr "Druk deze Kalender af"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Toon 1 dag"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Toon 1 maand"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Toon 1 week"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Toon de werkweek"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "Werkweek"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "Week"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "_Afspraak"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "Postinstellingen..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "Dag"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "Maand"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Vereisde informatie"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "Week"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_Taak"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10363,15 +12217,16 @@ msgid "Close"
 msgstr "Sluiten"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Deze afspraak sluiten"
+#, fuzzy
+msgid "Close this item"
+msgstr "Verwijder dit item"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Verwijder deze afspraak"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Verwijder dit item"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Hoofdgereedschapsbalk"
 
@@ -10380,117 +12235,85 @@ msgstr "Hoofdgereedschapsbalk"
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Opslaan"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Bewaar deze taak en sluit het dialoogvenster"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Help"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "En_velop Afdrukken..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Opslaan _Als..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Bewaar dit contact en sluit het dialoogvenster"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Stu_ur contact naar ander..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Zie help"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Stuur _bericht aan contact..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Verwijder dit item"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Verwijderen..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, 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
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "Stu_ur contact naar ander..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "Stuur _bericht aan contact..."
@@ -10500,22 +12323,22 @@ msgstr "Stuur _bericht aan contact..."
 msgid "Cancel Mee_ting"
 msgstr "Afspraak annuleren"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 #, fuzzy
 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:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, 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:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Dit bericht doorsturen"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10530,16 +12353,11 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr "_Bijeenkomst Plannen"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "Bijeenkomst plannen"
 
-#: 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"
-
 #: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10554,68 +12372,65 @@ msgid "Cancel the current mail operation"
 msgstr "Stop de huidige email operatie"
 
 #: 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
+#: ui/evolution-mail-global.xml.h:4
 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
+#: ui/evolution-mail-global.xml.h:5
 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
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "Creeer of bewerk definities van virtuele mappen"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Leeg Prullenbak"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Wachtwoorden _Vergeten"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 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:10
+#, fuzzy
+msgid "New Message"
+msgstr "Volgende bericht"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 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
+#: ui/evolution-mail-global.xml.h:12
 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
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Verstuur en Ontvang"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 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
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Show message preview window"
 msgstr "Laat berichten in normale stijl zien"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 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
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "_Virtuele-Mapbewerker..."
 
@@ -10640,98 +12455,108 @@ msgstr "Voorbeeld"
 msgid "_Send / Receive"
 msgstr "Verstuur en Ontvang"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "Bezig met aanmelden bij map \"%s\""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Verander de eigenschappen van deze map"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Verberg geselecteerde"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Knippen"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Druk dit bericht af"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Verberg geselecteerde"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Verberg verwijderde"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Doorgestuurde berichten"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 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
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Markeer Als Gelezen"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Markeer alle zichtbare berichten als gelezen"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Plak het klembord"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 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
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Alles Selecteren"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Selecteer _Gerelateerde Berichten"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 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
+#: ui/evolution-mail-list.xml.h:16
 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
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Selecteer alle zichtbare berichten"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 #, fuzzy
-msgid "Show _All"
-msgstr "Allen Weergeven"
+msgid "Sh_ow Hidden Messages"
+msgstr "Doorgestuurde berichten"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Laat berichten zien de tijdelijk zijn verborgen"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 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
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Verberg tijdelijk de geselecteerde berichten"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
 
@@ -10739,7 +12564,7 @@ msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
 msgid "_Expunge"
 msgstr "_Wissen"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Map"
 
@@ -10747,11 +12572,11 @@ msgstr "_Map"
 msgid "_Invert Selection"
 msgstr "Selectie _Inverteren"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
@@ -10979,7 +12804,8 @@ msgstr ""
 "Open het geselecteerde bericht in de opsteller om het opnieuw te zenden"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Geeft een afdrukvoorbeeld van het bericht"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11001,39 +12827,35 @@ msgstr "Vorige bericht"
 msgid "Previous Unread Message"
 msgstr "Vorige bericht"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "Bericht afdrukken..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "Afdrukvoorbeeld..."
-
-#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Print this message"
 msgstr "Bericht Afdrukken"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Beantwoorden"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Iedereen beantwoorden"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "Zoek bericht"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "Sla bericht op als tekstbestand"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 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-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Stel de pagina instellingen in voor de huidige printer"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -11075,69 +12897,53 @@ msgstr "VMap op Geadresseerden"
 msgid "VFolder on _Subject..."
 msgstr "VMap op Onderwerp"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "Filters _Toepassen"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "Maak Filter Van Bericht"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr "Bericht Doorsturen"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Berichten"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Weergave"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "Open Bericht"
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Re-send Message"
-msgstr "Bericht Opnieuw Versturen"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Dit venster sluiten"
 
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "Weerga_ve"
 
@@ -11202,11 +13008,6 @@ msgstr "Versleutelen met S/MIME"
 msgid "S/MIME Sign"
 msgstr "S/MIME Ondertekening"
 
-#: 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:20
 msgid "Save As"
 msgstr "Opslaan Als"
@@ -11335,7 +13136,7 @@ msgstr "Antwoordadres-veld:"
 msgid "_Security"
 msgstr "_Beveiliging"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Help"
 
@@ -11369,15 +13170,28 @@ msgstr "Afmelden"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "Taak Toewijze_n (FIXME)"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "Annuleren"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Verwijder deze taak"
+msgid "Cancel this task"
+msgstr "Annuleren"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "Lijst Verversen"
@@ -11386,43 +13200,31 @@ msgstr "Lijst Verversen"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, 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
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Verwijder de geselecteerde taken"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 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:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "Postinstellingen..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_Taak"
 
@@ -11454,177 +13256,157 @@ msgstr "Creeer een verbinding naar deze map op de snelkoppelingsbalk"
 msgid "Create a new folder"
 msgstr "Maak een nieuwe map aan"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Verwijder deze map"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Toon een andere map"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "_Afsluiten"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr "Evolution FAQ"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "Evolution Venster"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Programma verlaten"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "_Beginnen"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Importeer een extern bestandsformaat"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "Verplaats deze map naar een andere plaats"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "Open in Nieuw Venster"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Open deze map in een nieuw venster"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Toon informatie over Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Bug-Report Insturen"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Report insturen met Bug Buddy."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "Verander"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mappenbalk"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "Schakel offline werken aan of uit"
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr "Gebruik van de Cont_actbeheerder"
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr "Gebruik van de _Kalender"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "Gebruik van het _Mailcomponent"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Toon de geselecteerde map"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Over Evolution..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Afspraak (FIXME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "KopiКren...."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "_Mappenbalk"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "_Importeer bestand..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "_Index"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "_Bericht versturen"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "Verplaatsen..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nieuw"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Nieuwe Map"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "Hernoemen..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "_Snelkoppelingsbalk"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Snelkoppelingsbalk"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "_Taak (FIXME)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "Werk zonder netwerk"
 
 #: ui/my-evolution.xml.h:1
 #, fuzzy
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr "Verander de eigenschappen van deze map"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
-msgstr "Postinstellingen..."
+msgid "Print summary"
+msgstr "Samenvatting"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Gelezen"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "Samenvattingsinstellingen..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -11658,6 +13440,30 @@ msgstr "Berichten"
 msgid "With Category"
 msgstr "Op Categorie:"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Selecteer een bestand"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Secties:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Tijdzone: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11665,10 +13471,6 @@ msgstr "Op Categorie:"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Bezig"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Afwezig"
@@ -11741,7 +13543,7 @@ msgstr "Alle Aanwezigen"
 msgid "_Current View"
 msgstr "_Huidige Weergave"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "Defineer Bekijkmogelijkheid"
 
@@ -11751,19 +13553,20 @@ msgstr "Defineer Bekijkmogelijkheid"
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Vandaag"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "De datum moet ingevoerd worden in het formaat: %s"
@@ -11852,35 +13655,33 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "Contacten Bewerken"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Bewaar zoekopdracht"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "Uitgebreid zoeken"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Bewaar zoekopdracht"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "W_issen"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Allen Weergeven"
 
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Uitgebreid..."
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informatie"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Waarschuwing"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Fout"
@@ -11898,10 +13699,15 @@ msgstr "Bericht"
 msgid "Don't show this message again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_Zoeken"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "Zoek"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "De Persoonlijke Adresboekserver"
@@ -11922,6 +13728,309 @@ msgstr "init_corba(): kon Gnome niet initializeren"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
+#~ msgid "RDF Summary"
+#~ msgstr "RDF-Samenvatting"
+
+#~ msgid "LDAP Server"
+#~ msgstr "LDAP Server"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Onbekend adresboek type"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Geen (anonieme modus)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Onbekende aanmeldingstype"
+
+#~ msgid "Subtree"
+#~ msgstr "Subboom"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Onbekend bereiktype"
+
+#~ msgid "Bind DN:"
+#~ msgstr "Bind DN:"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "FIXME Verbindings DN Help tekst hier"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "FIXME Computernaam help tekst hier."
+
+#~ msgid "Root DN:"
+#~ msgstr "Stam DN:"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "FIXME Stam DN help tekst hier."
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "FIXME Poort help tekst hier."
+
+#~ msgid "Authentication:"
+#~ msgstr "Aanmelding:"
+
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "Geavanceerd LDAP opties"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "FIXME Pad Help tekst hier"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Maak pad als het niet bestaat."
+
+#~ 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."
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "FIXME Naam help tekst hier"
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "FIXME Beschrijving help tekst hier"
+
+#~ msgid "Name"
+#~ msgstr "Naam"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Voer het wachtwoord voor %s in"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "Naam bevat"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "Selecteer naam van:"
+
+#~ msgid "USA"
+#~ msgstr "Verenigde Staten"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Geannuleerd"
+
+#~ msgid "Transparent"
+#~ msgstr "Doorzichtig"
+
+#~ msgid "Opaque"
+#~ msgstr "Ondoorzichtig"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "De classificering moet 'Openbaar', 'PrivИ', 'Vertrouwelijk', of 'Geen' "
+#~ "zijn"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr ""
+#~ "De doorzichtigheid moet 'Doorzichtig', 'Ondoorzichtig' of 'Geen' zijn."
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Piep als het alarm venster verschijnt."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Kalender Instellingen"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "Datumnavigator instellingen"
+
+#~ msgid "Defaults"
+#~ msgstr "Standaardinstellingen"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Herinner me aan alle afspraken"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minuten voordat ze plaatsvinden."
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Verwijderd"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Geen"
+
+#~ msgid "Task"
+#~ msgstr "_Taak"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Vo_ltooid:"
+
+#~ msgid "Transparency"
+#~ msgstr "Transparantie"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Dit bericht is nu niet beschikbaar"
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "De map lijkt onherstelbaar beschadigd te zijn."
+
+#~ msgid "All"
+#~ msgstr "Allen"
+
+#~ msgid "Edit"
+#~ msgstr "Bewerken"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Sla op als VMap"
+
+#~ msgid "Resend"
+#~ msgstr "Laatste"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Evolution Accountbeheer"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "Op %s, %s schreef:"
+
+#~ msgid "Receiving"
+#~ msgstr "Aan het ontvangen"
+
+#~ msgid "Store"
+#~ msgstr "Opslag"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Geef mappen weer die beginnen met:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "Bezig met verkrijgen opslag voor \"%s\""
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %e %B, %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Afdrukken van bericht mislukt"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Nieuw contact"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "C_ontacten...."
+
+#~ msgid "Go to present time"
+#~ msgstr "Ga naar het heden"
+
+#~ msgid "W_ork Week"
+#~ msgstr "Werkweek"
+
+#~ msgid "_Day"
+#~ msgstr "Dag"
+
+#~ msgid "_Week"
+#~ msgstr "Week"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Deze afspraak sluiten"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "Printerinstellingen"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Bewaar de afspraak en sluit dit venster"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "_Acties"
+
+#~ msgid "Help"
+#~ msgstr "Help"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Stu_ur contact naar ander..."
+
+#~ msgid "See online help"
+#~ msgstr "Zie help"
+
+#~ msgid "Compose"
+#~ msgstr "Opstellen"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Beheer Postbusabonnementen..."
+
+#, fuzzy
+#~ msgid "Show _All"
+#~ msgstr "Allen Weergeven"
+
+#~ msgid "Print Preview..."
+#~ msgstr "Afdrukvoorbeeld..."
+
+#~ msgid "_Re-send Message"
+#~ msgstr "Bericht Opnieuw Versturen"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Gereedschapsbalken _Aanpassen"
+
+#~ msgid "Customize"
+#~ msgstr "Aanpassen"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Gereedschapsbalken aanpassen"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Verwijder deze taak"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Bewaar taak als iets anders"
+
+#~ msgid "Getting _Started"
+#~ msgstr "_Beginnen"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Gebruik van de Cont_actbeheerder"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Gebruik van de _Kalender"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Gebruik van het _Mailcomponent"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Afspraak (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#~ msgid "_Index"
+#~ msgstr "_Index"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Bericht versturen"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Taak (FIXME)"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Postinstellingen..."
+
 #, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Instellingen Wijzigen"
@@ -11960,9 +14069,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Alarms timeout after"
 #~ msgstr "Alarm stopt na"
 
-#~ msgid "Colors"
-#~ msgstr "Kleuren"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "Maak sluimeren mogelijk voor"
 
@@ -11981,9 +14087,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Overdue Items:"
 #~ msgstr "Verlopen items:"
 
-#~ msgid "TaskPad"
-#~ msgstr "TaakBlad"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Tijd Tot Verlooptijd"
 
@@ -12002,9 +14105,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Edit this task"
 #~ msgstr "Bewerk deze taak"
 
-#~ msgid "Go to Today"
-#~ msgstr "Ga Naar Vandaag"
-
 #~ msgid "Delete all Occurrences"
 #~ msgstr "Verwijder alle Gebeurtenissen"
 
@@ -12041,85 +14141,9 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ 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"
 
@@ -12174,9 +14198,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ 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"
 
@@ -12198,18 +14219,15 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ 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>"
+#~ "-----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>"
+#~ "-----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"
@@ -12244,9 +14262,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Create a new calendar"
 #~ msgstr "Maak een nieuwe kalender"
 
-#~ msgid "Day"
-#~ msgstr "Dag"
-
 #~ msgid "New _Event"
 #~ msgstr "Nieuwe Ka_lender"
 
@@ -12259,9 +14274,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Save calendar as something else"
 #~ msgstr "Kalender bewaren als iets anders"
 
-#~ msgid "Week"
-#~ msgstr "Week"
-
 #~ msgid "_Open Calendar"
 #~ msgstr "Open Ka_lender"
 
@@ -12401,9 +14413,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "File does not have a place for the services.\n"
 #~ msgstr "Bestand heeft geen plaats voor de diensten.\n"
 
-#~ msgid "Select a service"
-#~ msgstr "Selecteer een service"
-
 #~ msgid ""
 #~ "You can select a different HTML page for the background of the Executive "
 #~ "Summary.\n"
@@ -12460,15 +14469,12 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgstr ""
 #~ "Samenvattingscomponent kon Bonobo niet initialiseren.\n"
 #~ "Als er een waarschuwingsbericht was over de RootPOA, dan geeft dit\n"
-#~ "waarschijnlijk aan dat u Bonobo gecompileerd hebt tegen GOAD in plaats van "
-#~ "OAF."
+#~ "waarschijnlijk aan dat u Bonobo gecompileerd hebt tegen GOAD in plaats "
+#~ "van OAF."
 
 #~ msgid "Factory for the RDF summary."
 #~ msgstr "Fabriek voor de RDF-samenvatting."
 
-#~ msgid "RDF Summary"
-#~ msgstr "RDF-Samenvatting"
-
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "Fabriek voor het bonobo test-component."
 
@@ -12505,9 +14511,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "Adres_boek... (FIXME)"
 
-#~ msgid "C_lear"
-#~ msgstr "W_issen"
-
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "Contro_leer Namen (FIXME)"
 
@@ -12547,9 +14550,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Schedule some sort of a meeting"
 #~ msgstr "Een bijeenkomst plannen"
 
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "Taakve_rzoek (FIXME)"
-
 #~ msgid "_About..."
 #~ msgstr "_Over..."
 
@@ -12583,12 +14583,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Create a new email"
 #~ msgstr "Nieuwe e-mail opstellen"
 
-#~ msgid "Executive Summary Settings..."
-#~ msgstr "Samenvattingsinstellingen..."
-
-#~ msgid "New Mail"
-#~ msgstr "Nieuwe Berichten"
-
 #~ msgid "_All"
 #~ msgstr "Alle"
 
@@ -12604,15 +14598,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "_Unread"
 #~ msgstr "ongelezen"
 
-#~ msgid "Assig_n Task (FIXME)"
-#~ msgstr "Taak Toewijze_n (FIXME)"
-
-#~ msgid "Find"
-#~ msgstr "Zoek"
-
-#~ msgid "Meeting Re_quest (FIXME)"
-#~ msgstr "Ve_rzoek Bijeenkomst (FIXME)"
-
 #~ msgid "Redo"
 #~ msgstr "Herhalen"
 
diff --git a/po/nn.po b/po/nn.po
index e9cfae8df8..60dbaf36c7 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Gaute Hvoslef Kvalnes.
 # Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000.
 # Kjartan Maraas  <kmaraas@gnome.org>, 2001.
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.11\n"
-"POT-Creation-Date: 2001-08-08 14:48+0200\n"
+"POT-Creation-Date: 2001-08-22 18:50-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 +23,209 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr "mellombels feil i namneoppslag"
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3595
 #, fuzzy
 msgid "Card: "
 msgstr "Teikn"
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3597
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3606
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3602
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "Etterstaving"
 
-#: addressbook/backend/ebook/e-card.c:3622
+#: addressbook/backend/ebook/e-card.c:3616
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Start-dato:"
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3627
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Adresse"
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3636
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3634
 #, fuzzy
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr "ZIP/Postnummer"
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3635
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Land:"
 
-#: addressbook/backend/ebook/e-card.c:3654
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3669
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3693
+#: addressbook/backend/ebook/e-card.c:3687
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3690
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3721
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3729
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3727
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3746
+#: addressbook/backend/ebook/e-card.c:3740
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3748
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "Kategoriar"
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3749
 #, fuzzy
 msgid ""
 "\n"
@@ -241,25 +242,25 @@ msgstr "Kommentar:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3771
+#: addressbook/backend/ebook/e-card.c:3765
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "Praksis"
 
-#: addressbook/backend/ebook/e-card.c:4043
+#: addressbook/backend/ebook/e-card.c:4037
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "&Fleire spelarar"
 
-#: addressbook/backend/ebook/e-card.c:4051
+#: addressbook/backend/ebook/e-card.c:4045
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Kort 1:"
@@ -268,7 +269,7 @@ msgstr "Kort 1:"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/conduit/address-conduit.c:1100
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
@@ -284,22 +285,22 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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."
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -353,216 +354,220 @@ msgstr "ьydelagd oppsettfil."
 msgid "Factory for the sample Addressbook control"
 msgstr "Legg adresse til adresseboka"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
 #, fuzzy
-msgid "LDAP Server"
-msgstr "Tenar:"
+msgid "Contacts"
+msgstr "&Innhald ..."
 
-#: addressbook/gui/component/addressbook-config.c:150
+#: addressbook/gui/component/addressbook-component.c:68
 #, fuzzy
-msgid "File"
-msgstr "Fil"
+msgid "Folder containing contact information"
+msgstr "Les filinformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
-msgid "Unknown addressbook type"
-msgstr "Kan ikkje opna adresseboka."
-
-#: 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:51
-msgid "Password"
-msgstr ""
+msgid "New Contact"
+msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:168
+#: addressbook/gui/component/addressbook-component.c:386
 #, fuzzy
-msgid "Unknown auth type"
-msgstr "Ukjend feil"
+msgid "New _Contact"
+msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:177
+#: addressbook/gui/component/addressbook-component.c:387
 #, fuzzy
-msgid "Base"
-msgstr "Lim inn"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr ""
+msgid "New Contact List"
+msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-component.c:387
 #, fuzzy
-msgid "Subtree"
-msgstr "Kjelder"
+msgid "New Contact _List"
+msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "SmЕ ikon"
 
-#. Remember the password?
-#: addressbook/gui/component/addressbook-config.c:352 mail/mail-mt.c:439
-msgid "Remember this password"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:403
+#: addressbook/gui/component/addressbook-config.glade.h:4
 #, fuzzy
-msgid "Host:"
-msgstr "time/timar"
+msgid "Addressbook Sources"
+msgstr "Kjelde:"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Legg til ..."
 
-#: addressbook/gui/component/addressbook-config.c:406
+#: addressbook/gui/component/addressbook-config.glade.h:6
 #, fuzzy
-msgid "Root DN:"
-msgstr "Rot"
+msgid "Base"
+msgstr "Lim inn"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "KBasic"
 
-#: addressbook/gui/component/addressbook-config.c:411
+#: addressbook/gui/component/addressbook-config.glade.h:8
 #, fuzzy
-msgid "Port:"
-msgstr "Prioritet:"
+msgid "De_lete"
+msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:432
+#: addressbook/gui/component/addressbook-config.glade.h:10
 #, fuzzy
-msgid "Search Scope:"
+msgid "Search _base:"
 msgstr "SЬk"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Autentisering:"
-
-#: addressbook/gui/component/addressbook-config.c:501
+#: addressbook/gui/component/addressbook-config.glade.h:11
 #, fuzzy
-msgid "Advanced LDAP Options"
-msgstr "Avanserte kISDN-val"
-
-#: addressbook/gui/component/addressbook-config.c:522
-msgid "Path:"
-msgstr "Sti:"
-
-#: 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 "Fila finst ikkje\n"
+msgid "Search s_cope: "
+msgstr "SЬk"
 
-#: addressbook/gui/component/addressbook-config.c:663
+#: addressbook/gui/component/addressbook-config.glade.h:12
 #, fuzzy
-msgid "Edit Addressbook"
-msgstr "KDE adressebok"
+msgid "Server Name"
+msgstr "Merk omrЕde"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/component/addressbook-config.glade.h:13
 #, fuzzy
-msgid "Add Addressbook"
-msgstr "KDE adressebok"
+msgid "Sub"
+msgstr "Sum"
 
-#: addressbook/gui/component/addressbook-config.c:683
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:691
-#: my-evolution/e-summary-preferences.c:881
-msgid "Name:"
-msgstr "Navn:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
 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 "Skildring:"
+#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid ""
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Kjelde:"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
-msgid "De_lete"
-msgstr "Slett"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr "Namn"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, fuzzy
-msgid "URI"
-msgstr "URL"
+msgid "_Account name:"
+msgstr "SmЕ ikon"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:87
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "_Add"
 msgstr "Legg til"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:92 ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_Edit"
 msgstr "Rediger"
 
-#: addressbook/gui/component/addressbook-storage.c:131
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Autentisering:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Prioritet:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Lagra melding"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/component/addressbook.c:379
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Oppgi ditt OpenPGP-passord"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Autentisering:"
+
+#: addressbook/gui/component/addressbook.c:405
+#, fuzzy
+msgid "Email Address:"
+msgstr "E-post-adresse:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Lagra som"
+
+#: addressbook/gui/component/addressbook.c:481
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Kan ikkje opna adresseboka."
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:488
 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:419
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -570,7 +575,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:427
+#: addressbook/gui/component/addressbook.c:501
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -580,32 +585,41 @@ msgstr ""
 "Sjekk at eininga finst og at du har\n"
 "skrivetilgang til ho."
 
-#: addressbook/gui/component/addressbook.c:578
-#: calendar/gui/cal-search-bar.c:54
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:579
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:580
+#: addressbook/gui/component/addressbook.c:644
 #, fuzzy
 msgid "Email contains"
 msgstr "SmЕ ikon"
 
-#: addressbook/gui/component/addressbook.c:581
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "SpЬrjinga inneheld"
+msgid "Category is"
+msgstr "Kategoriar"
 
-#: addressbook/gui/component/addressbook.c:582 widgets/misc/e-filter-bar.h:97
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Advanced..."
 msgstr "Legg til ..."
 
-#: addressbook/gui/component/addressbook.c:741
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Kategoriar"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -620,20 +634,20 @@ 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:1549
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "PrimФr e-post"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1550
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 #, fuzzy
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 #, fuzzy
 msgid "Email 3"
 msgstr "E-post 3"
@@ -658,20 +672,20 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "A&dressebok ..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "E-post-adresse:"
@@ -696,13 +710,10 @@ 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:634
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:550 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:205
-#: shell/e-shortcuts-view.c:414
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Fjern"
 
@@ -721,35 +732,52 @@ msgstr "&Send e-post"
 msgid "Unnamed Contact"
 msgstr "Endra skrift"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
-msgid "Message Recipients"
-msgstr "Melding motteken"
+msgid "C_ontaining:"
+msgstr "Handlingar"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
-msgid "Select Names"
-msgstr "Merk omrЕde"
+msgid "Co_ntacts:"
+msgstr "&Innhald ..."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "Vel ei gruppe fЬrst."
+msgid "F_ind"
+msgstr "Finn:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
+msgid "Select Names"
+msgstr "Merk omrЕde"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
 msgid "_Category:"
 msgstr "Kategoriar"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
-msgid "_Search"
-msgstr "SЬk"
+msgid "_Folder:"
+msgstr "Mapper"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Melding motteken"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #, fuzzy
@@ -768,7 +796,7 @@ msgstr "Firma-fax"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 #, fuzzy
 msgid "Ca_tegories..."
 msgstr "Kategoriar ..."
@@ -779,17 +807,16 @@ msgid "Contact Editor"
 msgstr "Comment=X-redigering"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Detaljar"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
 #, fuzzy
-msgid "File As:"
+msgid "File A_s:"
 msgstr "Arkiver som"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "General"
 msgstr "Generelt"
 
@@ -814,222 +841,229 @@ msgstr "Telefontypar"
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: 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:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #, fuzzy
 msgid "_Address..."
 msgstr "Adresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "_Assistant's name:"
 msgstr "&Namn pЕ assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "_Birthday:"
 msgstr "FЬdselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #, fuzzy
 msgid "_Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:20
+#: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "_Contacts..."
 msgstr "&Innhald ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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:1313
-#: mail/mail-config.glade.h:91 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:42
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Delete"
 msgstr "Slett"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "_Department:"
 msgstr "Avdeling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "_Full Name..."
 msgstr "Fullt namn"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Job title:"
 msgstr "Jobb-tittel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Na_mn pЕ sjef:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "Kalle_namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "_Office:"
 msgstr "K&ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "_Profession:"
 msgstr "&Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Spouse:"
 msgstr "Ektefelle"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_This is the mailing address"
 msgstr "Rediger e-post-adresser"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "&WINS-adresse:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 #, fuzzy
 msgid "Assistant"
 msgstr "Namn pЕ assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: e-util/e-categories-config.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 #, fuzzy
 msgid "Business 2"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 #, fuzzy
 msgid "Car"
 msgstr "Teikn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1513
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1514
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1515
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 #, fuzzy
 msgid "Home 2"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1516
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1517
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1518
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 #, fuzzy
 msgid "Mobile"
 msgstr "Mobil:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1519
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: mail/mail-config.glade.h:48
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1520
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1521
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "PersonsЬkjar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1522
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 #, fuzzy
 msgid "Primary"
 msgstr "Privat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1523
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 #, fuzzy
 msgid "Radio"
 msgstr "Tilfeldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1524
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1525
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 #, fuzzy
 msgid "TTY/TDD"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 #, fuzzy
 msgid "Edit Full"
 msgstr "Rediger fil"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:772
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 #, fuzzy
 msgid "Full Name"
 msgstr "Fullt namn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 #, fuzzy
 msgid "E-mail"
 msgstr "E-post 2"
@@ -1048,49 +1082,1042 @@ msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 #, fuzzy
+msgid "Afghanistan"
+msgstr "Namn pЕ assistent"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Automatisk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Retning"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "August"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "Еr"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Storleik"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Sender %1"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#, fuzzy
+msgid "Bouvet Island"
+msgstr "moderert"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
+#, fuzzy
 msgid "Canada"
 msgstr "Skriv ut alle"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Teikn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 #, fuzzy
 msgid "Check Address"
 msgstr "Alternativ adresse"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Name=Kinesisk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Name=Kinesisk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Lukk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Kopierer"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 #, fuzzy
 msgid "Countr_y:"
 msgstr "Land:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 #, fuzzy
 msgid "Finland"
 msgstr "Finn ..."
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Avbryt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "Gresk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finn ..."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Skriv ut alle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Generelt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "time/timar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Sundag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+#, fuzzy
+msgid "India"
+msgstr " dag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#, fuzzy
+msgid "Ireland"
+msgstr "Koreansk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+#, fuzzy
+msgid "Japan"
+msgstr "Japansk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#, fuzzy
+msgid "Jordan"
+msgstr "Koreansk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Senk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Senk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "seriell"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#, fuzzy
+msgid "Lithuania"
+msgstr "Lyssetjing"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Mars"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#, fuzzy
+msgid "Marshall Islands"
+msgstr "MarshallЬyane"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Marger"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "MЕndag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "MЕndag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Mobil:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "PersonsЬkjar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Svar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Vel mappe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "&Ny kontakt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "HЬgd"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "seriell"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minutt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "&No"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Lim inn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Skriv ut alle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finn ..."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "StЕande"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "Slutt etter"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Start om att"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Skriv ut alle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "modem"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Generelt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "&Plan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "og"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Sun"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Kallenamn:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finn ..."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Resultat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "OppgЕver"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finn ..."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Til"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Tonga"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Tys"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+msgid "Turkmenistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Skriv ut alle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#, fuzzy
+msgid "Ukraine"
+msgstr "Brasiliansk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Ulest melding"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Merk omrЕde"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#, fuzzy
+msgid "Western Sahara"
+msgstr "Vesteuropeisk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 #, fuzzy
 msgid "_Address:"
 msgstr "Adresse"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 #, fuzzy
 msgid "_City:"
 msgstr "Stad:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 #, fuzzy
 msgid "_PO Box:"
 msgstr "Postboks"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 #, fuzzy
 msgid "_State/Province:"
 msgstr "Stat/provins"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 #, fuzzy
 msgid "_ZIP Code:"
 msgstr "ZIP/Postnummer"
@@ -1189,6 +2216,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Fjern"
@@ -1199,7 +2227,7 @@ msgid "contact-list-editor"
 msgstr "Comment=X-redigering"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Comment=X-redigering"
@@ -1210,7 +2238,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:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 #, fuzzy
 msgid "Duplicate Contact Detected"
 msgstr "Lag kopi av side"
@@ -1233,33 +2261,33 @@ 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:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 #, fuzzy
 msgid "Conflicting Contact:"
 msgstr "Koplar til: "
 
-#: 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:5
 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:146
-#: widgets/misc/e-filter-bar.c:241
+#: widgets/misc/e-filter-bar.c:243
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Legg til ..."
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:258
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "SЬk"
 
@@ -1390,49 +2418,55 @@ msgstr "av"
 msgid "z"
 msgstr "Hz"
 
-#: 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:610
-#: addressbook/gui/widgets/e-addressbook-view.c:670
-#: addressbook/gui/widgets/e-addressbook-view.c:1282
-#: ui/evolution-addressbook.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard"
 msgstr "Lagra som"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:671
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send contact to other"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "Opna ..."
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: ui/evolution-addressbook.xml.h:26
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Send message to contact"
+msgid "Forward Contact"
+msgstr "Smarte vedlegg"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Private meldingar"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:675 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Slett"
 
@@ -1448,8 +2482,8 @@ msgid "Success"
 msgstr "Vellukka"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1589
-#: shell/e-storage.c:501
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -1458,7 +2492,7 @@ msgstr "Ukjend feil"
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
@@ -1480,9 +2514,12 @@ msgstr ""
 "%1"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
-msgstr "Avbroten."
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
+msgstr "Avbroten"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #, fuzzy
@@ -1514,147 +2551,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:1155
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr "Feil ved fjerning av oppsett"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:770
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 #, 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:771
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Arkiver som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:773
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 #, fuzzy
 msgid "Email"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "PrimФr telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Telefon til assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Firma-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "Hovudtelefon til firmaet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Heime-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 #, fuzzy
 msgid "Organization"
 msgstr "Organisasjon:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Firma-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Heime-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Firma-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Alternativ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Alternativ adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 #, fuzzy
 msgid "Department"
 msgstr "Avdeling:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 #, fuzzy
 msgid "Office"
 msgstr "K&ontor:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 #, fuzzy
 msgid "Title"
 msgstr "Tittel:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 #, fuzzy
 msgid "Profession"
 msgstr "&Yrke:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 #, fuzzy
 msgid "Manager"
 msgstr "PersonsЬkjar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 #, fuzzy
 msgid "Nickname"
 msgstr "Kallenamn:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 #, fuzzy
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "Note"
 msgstr "Ingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1152
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "Ferdig."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1184
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "&Suspender ..."
@@ -1862,6 +2899,23 @@ msgstr "Breidd:"
 msgid "_Font..."
 msgstr "Skrifttype ..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Skriv ut alle"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Skriv ut alle"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Private meldingar"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 #, fuzzy
@@ -2041,37 +3095,46 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:414
 #, 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:1353 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%1 bit %2 %3"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: calendar/gui/calendar-commands.c:426 calendar/gui/calendar-commands.c:431
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:439
-#: widgets/misc/e-calendar-item.c:1068
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "Id"
+
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
 #, fuzzy
-msgid "%B %Y"
-msgstr "%1 %2"
+msgid "%d %B %Y"
+msgstr "%1 bit %2 %3"
 
-#: calendar/gui/calendar-commands.c:429
-msgid "%B"
-msgstr ""
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+#, fuzzy
+msgid "%d %B"
+msgstr "%1 %2"
 
-#: calendar/gui/calendar-commands.c:575
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -2111,22 +3174,22 @@ msgid "W"
 msgstr "RW"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:639
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 #, fuzzy
 msgid "High"
 msgstr "HЬgd"
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:638
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:637
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 #, fuzzy
 msgid "Low"
 msgstr "Senk"
@@ -2143,41 +3206,34 @@ msgid "Busy"
 msgstr "Oppteke"
 
 #: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:401
 #, fuzzy
 msgid "Not Started"
 msgstr "Starta"
 
 #: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:402
 #, fuzzy
 msgid "In Progress"
 msgstr "Framgong:"
 
 #: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:648
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Ferdig"
 
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
-#: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:404 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:839 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:842 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
@@ -2206,20 +3262,19 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1105
-#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:327
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1394
-#: mail/mail-accounts.c:134 mail/mail-accounts.c:388
-#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1375
-#: 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
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
 msgid "None"
 msgstr "Ingen"
 
@@ -2232,15 +3287,15 @@ msgstr "Repetering"
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1634 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 #, fuzzy
 msgid "No"
 msgstr "&No"
@@ -2264,62 +3319,94 @@ msgstr "&Trevising"
 msgid "Month View"
 msgstr "MЕnadsvising"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:56
 #, fuzzy
 msgid "Summary contains"
 msgstr "SpЬrjinga inneheld"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:57
 #, fuzzy
 msgid "Description contains"
 msgstr "Skildringar"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:58
 #, fuzzy
 msgid "Comment contains"
 msgstr "ikkje inneheld"
 
-#: calendar/gui/cal-search-bar.c:349
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
 #, fuzzy
-msgid "Category:"
-msgstr "Kategoriar"
+msgid "Calendar"
+msgstr "Skriv ut alle"
 
-#. All, Unmatched, separator items
-#: calendar/gui/cal-search-bar.c:469
-msgid "All"
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:474
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "OppgЕver"
+
+#: calendar/gui/component-factory.c:56
 #, fuzzy
-msgid "Unfiled"
-msgstr "Utan tittel"
+msgid "Folder containing to-do items"
+msgstr "Fil alt i liste"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "&Vis avtale ..."
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Create a new task"
+msgstr "Lagar eit nytt dokument"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "OppgЕve"
 
 #: calendar/gui/control-factory.c:128
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Eigenskapar for meldingsdel"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Tar-val"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 #, fuzzy
 msgid "Program Alarm Options"
 msgstr "Programplasseringar"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 #, fuzzy
 msgid "Unknown Alarm Options"
 msgstr "Kjende program"
@@ -2378,120 +3465,117 @@ msgstr "time/timar"
 msgid "minutes"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " dag"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr "Vis dato"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "Veke"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr "Vis %1"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Vis Еtvaringsmelding"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #, fuzzy
 msgid "Send an email"
 msgstr "Hentar data frЕ %1"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 #, fuzzy
 msgid "Run a program"
 msgstr "Terminalprogram:"
 
-#: 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
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, fuzzy
 msgid "after end of appointment"
 msgstr "&Slett avtale"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:1
 #, fuzzy
 msgid "Basics"
 msgstr "KBasic"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:298
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
 msgid "Date/Time:"
 msgstr "Dato/tid"
@@ -2502,9 +3586,8 @@ msgid "Reminders"
 msgstr "PЕminning:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Samandrag:"
@@ -2514,13 +3597,12 @@ msgstr "Samandrag:"
 msgid "_Options..."
 msgstr "Val ..."
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "after"
 msgstr "Slutt etter"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr ""
 
@@ -2539,7 +3621,7 @@ msgstr "&Slett avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:112
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 #, fuzzy
 msgid "minute(s)"
 msgstr "minutt"
@@ -2560,184 +3642,235 @@ msgid "10 minutes"
 msgstr "minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr ""
+#, fuzzy
+msgid "15 minutes"
+msgstr "minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 #, fuzzy
-msgid "15 minutes"
+msgid "30 minutes"
 msgstr "minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 #, fuzzy
-msgid "24 hour"
-msgstr "time/timar"
+msgid "60 minutes"
+msgstr "minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
-msgid "30 minutes"
-msgstr "minutt"
+msgid "Calendar and Tasks Settings"
+msgstr "Skriftinnstillingar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
-msgid "60 minutes"
-msgstr "minutt"
+msgid "Color for overdue tasks"
+msgstr "Farge for &siterte teikn:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, fuzzy
-msgid "Calendar Preferences"
-msgstr "Innstillingar"
+msgid "Color for tasks due today"
+msgstr "Farge eller pixmap"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "Color for overdue tasks"
-msgstr "Farge for &siterte teikn:"
+msgid "Create new appointments with a default _reminder"
+msgstr "&Slett avtale"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
-msgid "Color for tasks due today"
-msgstr "Farge eller pixmap"
+msgid "Days"
+msgstr "Dag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Compress weekends in month view"
+msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:25
+#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
-msgid "Display"
-msgstr "Vis"
+msgid "Friday"
+msgstr "Fredag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
-msgid "End of day:"
-msgstr "Slutt trekk"
+msgid "Hours"
+msgstr "time/timar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
-msgid "Friday"
-msgstr "Fredag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Mon"
-msgstr "MЕn"
+msgid "Minutes"
+msgstr "minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "MЕndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #, fuzzy
-msgid "Overdue tasks:"
+msgid "O_verdue tasks:"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Sat"
-msgstr "Lau"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:970
 #, fuzzy
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
-msgid "Show appointment end times in week and month views"
+msgid "Show appointment _end times in week and month views"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #, fuzzy
-msgid "Show week numbers in date navigator"
+msgid "Show week _numbers in date navigator"
 msgstr "Vis %1"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #, fuzzy
-msgid "Start of day:"
+msgid "Sta_rt of day:"
 msgstr "Start-dato"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Sun"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#, fuzzy
+msgid "Su_n"
 msgstr "Sun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sundag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
-msgid "Task List"
-msgstr "OppgЕver"
+msgid "T_hu"
+msgstr "Tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #, fuzzy
-msgid "Tasks due today:"
-msgstr "&Opplys syntaks"
+msgid "T_ue"
+msgstr "Tys"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Thu"
-msgstr "Tor"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "&Opplys syntaks"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #: calendar/gui/dialogs/recurrence-page.c:968
 #, fuzzy
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr "Tid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr "Tidssone:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
-msgid "Time divisions:"
+msgid "Time di_visions:"
 msgstr "Dimensjonar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #, fuzzy
 msgid "Time format:"
 msgstr "Tidsformat:"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:966
+#, fuzzy
+msgid "Tuesday"
+msgstr "Tysdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:967
+#, fuzzy
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "&Arbeidsveke"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "_12 hour (AM/PM)"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
-msgid "Time zone:"
-msgstr "Tidssone:"
+msgid "_24 hour"
+msgstr "time/timar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Tue"
-msgstr "Tys"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:966
-#, fuzzy
-msgid "Tuesday"
-msgstr "Tysdag"
+msgid "_Compress weekends in month view"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Wed"
-msgstr "Ons"
+#, fuzzy
+msgid "_Display"
+msgstr "Vis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:967
 #, fuzzy
-msgid "Wednesday"
-msgstr "Onsdag"
+msgid "_End of day:"
+msgstr "Slutt trekk"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Work Week"
-msgstr "&Arbeidsveke"
+msgid "_Fri"
+msgstr "Fre"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_General"
+msgstr "Generelt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Neste melding"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Mon"
+msgstr "MЕn"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Other"
+msgstr "Anna"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Sat"
+msgstr "Lau"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "_Task List"
+msgstr "OppgЕver"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Wed"
+msgstr "Ons"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr "&Slett avtale"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2808,82 +3941,77 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 #, fuzzy
 msgid " to "
 msgstr " til:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 #, fuzzy
 msgid " (Due "
 msgstr " Slett "
 
-#: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Forfall"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "OppgЕver"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 #, fuzzy
 msgid "No summary"
 msgstr "oppsummering"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1477
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1482
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Lagra som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 #, fuzzy
 msgid "Unable to obtain current version!"
 msgstr "Kan ikkje setja opp utskriftstenaren."
@@ -2933,43 +4061,37 @@ msgstr "Er du sikker pЕ at du vil sletta denne klassen?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker pЕ at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Vel ei biletefil"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "Utval:"
+msgid "Addressbook..."
+msgstr "Adressebok"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Time Zones"
-msgstr "Tidssone"
+msgid "Delegate To:"
+msgstr "Delegert"
 
-#: 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/e-delegate-dialog.glade.h:3
+#, fuzzy
+msgid "Enter Delegate"
+msgstr "Slett"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 #, fuzzy
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 #, fuzzy
 msgid "Reminder"
 msgstr "PЕminning:"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr "MЬte"
 
@@ -2983,7 +4105,7 @@ msgid "B_usy"
 msgstr "Oppteke"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 #, fuzzy
 msgid "Classification"
@@ -2995,7 +4117,7 @@ msgid "Con_fidential"
 msgstr "Eksponentiell"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Date & Time"
 msgstr "Dato"
@@ -3006,13 +4128,13 @@ msgid "F_ree"
 msgstr "Gresk"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
 msgid "Pri_vate"
 msgstr "Privat"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:6
 #, fuzzy
 msgid "Pu_blic"
 msgstr "Praksis"
@@ -3024,7 +4146,7 @@ msgid "Show Time As"
 msgstr "Vis brukarar"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Samandrag:"
@@ -3039,136 +4161,136 @@ msgstr "Slutt-tid:"
 msgid "_Start time:"
 msgstr "Start-tid:"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Mellombels"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Slett"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "Framgong:"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Tenarinformasjon"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Sende byte"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "F&jern rad ..."
@@ -3211,21 +4333,20 @@ msgid "Role"
 msgstr "Mobil:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14 e-util/e-categories-config.c:94
-#: filter/libfilter-i18n.h:49 mail/message-list.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
+#: 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:82
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 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
 #, fuzzy
 msgid "Organizer:"
@@ -3275,7 +4396,7 @@ msgstr "MЕnad"
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -3285,42 +4406,43 @@ msgstr "gong(ar)"
 msgid "A_dd"
 msgstr "Legg til"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Custom recurrence"
-msgstr "Tilpassa repetering"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Kvar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-#, fuzzy
-msgid "No recurrence"
-msgstr "Repetering"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 #, fuzzy
 msgid "Preview"
 msgstr "FЬrehandsvising:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 #, fuzzy
 msgid "Recurrence Rule"
 msgstr "Regel for repetering"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Tilpassa repetering"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
-msgid "Simple recurrence"
+msgid "_Modify"
+msgstr "Endre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
 msgstr "Repetering"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:13
 #, fuzzy
-msgid "_Modify"
-msgstr "Endre"
+msgid "_Simple recurrence"
+msgstr "Repetering"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 #, fuzzy
@@ -3368,70 +4490,64 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy
-msgid "Date Completed:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#, fuzzy
-msgid "Delegated From:"
-msgstr "Delegert"
-
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #, fuzzy
-msgid "Delegated To:"
-msgstr "Delegert"
+msgid "Date Completed:"
+msgstr "Ferdig"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #, fuzzy
-msgid "No one"
-msgstr "Ingen"
+msgid "Progress"
+msgstr "Framgong:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "OppgЕve"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+#, fuzzy
+msgid "_Priority:"
+msgstr "Prioritet:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% Comp_lete:"
-msgstr "Ferdig"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Status:"
+msgstr "Status:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
 #, fuzzy
-msgid "Progress"
-msgstr "Framgong:"
+msgid "Assignment"
+msgstr "Avtale"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Skildring:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "Start-dato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:19
+#: calendar/gui/dialogs/task-page.glade.h:9
 #, fuzzy
 msgid "_Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "_Due Date:"
 msgstr "Forfallsdato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-#, fuzzy
-msgid "_Priority:"
-msgstr "Prioritet:"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-#, fuzzy
-msgid "_Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
@@ -3487,64 +4603,61 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3363
-#: calendar/gui/e-week-view.c:3206 mail/folder-browser.c:1278
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 #, fuzzy
 msgid "_Open"
 msgstr "Opna ..."
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3372
-#: calendar/gui/e-week-view.c:3215 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: 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:855 calendar/gui/e-day-view.c:3374
-#: calendar/gui/e-week-view.c:3217 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "_Copy"
 msgstr "Kopier"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3349
-#: calendar/gui/e-day-view.c:3376 calendar/gui/e-week-view.c:3193
-#: calendar/gui/e-week-view.c:3219 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "_Paste"
 msgstr "Lim inn"
 
-#: calendar/gui/e-calendar-table.c:862
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:864
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Slett denne adressa"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:869
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Slett den valte oppgЕva"
 
-#: calendar/gui/e-calendar-table.c:1129
+#: calendar/gui/e-calendar-table.c:1130
 #, fuzzy
-msgid "Click here to add a task"
+msgid "Click to add a task"
 msgstr "Trykk her for Е leggja til ein ny virtuell vert."
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, fuzzy, no-c-format
-msgid "% Complete"
-msgstr "Ferdig"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 #, fuzzy
 msgid "Alarms"
@@ -3589,7 +4702,11 @@ msgstr "Prioritet"
 msgid "Start Date"
 msgstr "Start-dato:"
 
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Samandrag"
 
@@ -3610,175 +4727,262 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1339
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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:1366
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:348
 #, fuzzy
 msgid "%d %b"
 msgstr "%1 %2"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:578 calendar/gui/e-week-view.c:311
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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:581 calendar/gui/e-week-view.c:314
+#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3342
-#, fuzzy
-msgid "New _Appointment"
-msgstr "&Vis avtale ..."
-
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3188
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Ny &hending ..."
 
-#: calendar/gui/e-day-view.c:3354 calendar/gui/e-week-view.c:3198
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "GЕ til &i dag"
 
-#: calendar/gui/e-day-view.c:3356 calendar/gui/e-week-view.c:3200
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "&GЕ til side ..."
 
-#: calendar/gui/e-day-view.c:3365 calendar/gui/e-week-view.c:3208
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:3384 calendar/gui/e-week-view.c:3233
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:3386 calendar/gui/e-week-view.c:3235
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Erstatt denne fЬrekomsten?"
 
-#: calendar/gui/e-day-view.c:3388 calendar/gui/e-week-view.c:3237
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Slettar klassen"
 
-#: 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:617
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "Dette er ei repeterande hending."
+msgid "Meeting Information"
+msgstr "Personleg informasjon"
 
-#: calendar/gui/e-itip-control.c:700
-#, fuzzy
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
-"Dette er fЬrste nivЕ\n"
-"i denne samlinga."
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:623
 #, fuzzy
-msgid "This is a request for the latest event information."
-msgstr "Dette er ei fЬrehandsvising av det valte bakgrunnsbiletet."
+msgid "Meeting Proposal"
+msgstr "MЬte"
 
-#: calendar/gui/e-itip-control.c:706
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:628
 #, fuzzy
-msgid "This is a reply to a meeting request."
+msgid "Meeting Update"
+msgstr "MЬte"
+
+#: calendar/gui/e-itip-control.c:632
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "generer avlusingsinformasjon"
+
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
-msgid "This is an event cancellation."
+msgid "Meeting Reply"
+msgstr "MЬte"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
-"Dette er det siste nivЕet\n"
-"i denne samlinga."
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:643
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Meldinga har ingen sendar"
+msgid "Meeting Cancellation"
+msgstr "Vel ikon"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
-msgid "This is a task request."
-msgstr "Dette er ei repeterande hending."
+msgid "Bad Meeting Message"
+msgstr "&Finn i melding ..."
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:676
 #, fuzzy
-msgid "This is a request for the latest task information."
+msgid "Task Update"
+msgstr "Slutt etter"
+
+#: calendar/gui/e-itip-control.c:680
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Dette er ei fЬrehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:686
 #, fuzzy
-msgid "This is a reply to a task request."
+msgid "Task Reply"
+msgstr "Svar"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
-"Dette er ein katalog og inga fil:\n"
-"%s"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "This is an task cancellation."
+msgid "Task Cancellation"
 msgstr "Dette er inga lokal fil.\n"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
-msgid "This is freebusy information."
+msgid "Bad Task Message"
+msgstr "Skriv ut alle"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
 msgstr "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:714
 #, fuzzy
-msgid "This is a request for freebusy information."
+msgid "Free/Busy Information"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr "PrЬv ╚%s --help╩ for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:723
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr "Dette er ei repeterande hending."
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:729
 #, fuzzy
-msgid "The message contains only unsupported requests."
-msgstr "Meldinga har ingen sendar"
-
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
-msgstr ""
+msgid "Bad Free/Busy Message"
+msgstr "Private meldingar"
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:940
 #, fuzzy
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Ferdig"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "Ferdig"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Dato"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
@@ -3832,21 +5036,12 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje stЬtta."
 
-#. 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:240
-#, fuzzy
-msgid "%d %B"
-msgstr "%1 %2"
-
-#: calendar/gui/e-week-view.c:3186 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/gnome-cal.c:1248
+#: calendar/gui/gnome-cal.c:1260
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -3854,7 +5049,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1259
+#: calendar/gui/gnome-cal.c:1271
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje stЬtta."
@@ -3886,50 +5081,50 @@ msgstr "GЕ til side"
 
 #: calendar/gui/goto-dialog.glade.h:6
 #, fuzzy
+msgid "Go To Today"
+msgstr "GЕ til &i dag"
+
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
 msgid "January"
 msgstr "Januar"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "March"
 msgstr "Mars"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
 msgid "May"
 msgstr "MЕndag"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 #, fuzzy
 msgid "October"
 msgstr "Oktober"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go to Today"
-msgstr "GЕ til &i dag"
-
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -4092,12 +5287,6 @@ msgstr "Fre"
 msgid "Sa"
 msgstr "Lau"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-shortcuts.c:1024
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "OppgЕver"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -4134,9 +5323,8 @@ msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1846 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Print Preview"
 msgstr "&FЬrehandsvising ..."
@@ -4276,7 +5464,11 @@ msgid ""
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:978
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -4390,7 +5582,7 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-search.c:495 camel/camel-filter-search.c:502
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -4419,12 +5611,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -4620,7 +5812,7 @@ msgid "Connection cancelled"
 msgstr "Avbroten."
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4752,42 +5944,69 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Inga autentisering i det heile"
 
+#: 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:54
+msgid "Password"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Kjelder"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "Lagar"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4800,12 +6019,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4853,7 +6072,7 @@ msgstr "Kunne ikkje leggja til melding:\n"
 msgid "Failed to verify certificates."
 msgstr "еtvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4861,7 +6080,7 @@ msgid ""
 msgstr "Emne"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4952,23 +6171,23 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1478
-#: camel/providers/imap/camel-imap-folder.c:1902
+#: camel/providers/imap/camel-imap-folder.c:1491
+#: 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:1620
-#: camel/providers/imap/camel-imap-folder.c:1701
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1626
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1935
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -4979,7 +6198,7 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Berre sjekk for ny e-post."
@@ -4989,7 +6208,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:651
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Mapper"
 
@@ -5029,7 +6248,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
@@ -5040,7 +6259,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -5052,12 +6271,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:327
+#: camel/providers/imap/camel-imap-store.c:837
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/imap/camel-imap-store.c:1023
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -5319,14 +6538,17 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing folder"
 msgstr "Synkroniser"
 
 #: camel/providers/local/camel-mbox-summary.c:254
 #: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
 
 #: camel/providers/local/camel-mbox-summary.c:296
 #: camel/providers/local/camel-spool-summary.c:426
@@ -5335,26 +6557,26 @@ 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 ""
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
+msgstr "Leitar etter tilleggsmodular"
 
 #: 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:1538
+#: camel/providers/local/camel-spool-summary.c:931
 #, fuzzy
-msgid "Synchronising folder"
+msgid "Synchronizing folder"
 msgstr "Synkroniser"
 
 #: 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -5463,6 +6685,17 @@ msgstr "Denne mappa kan ikkje fjernast."
 msgid "Spool folders cannot be deleted"
 msgstr "Denne mappa kan ikkje slettast."
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr ""
+
+#: 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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5555,36 +6788,36 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:193
+#: camel/providers/pop3/camel-pop3-folder.c:189
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Mottek meldingar frЕ %1"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-folder.c:238
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:331
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: camel/providers/pop3/camel-pop3-folder.c:347
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, fuzzy, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Slett e-post frЕ tenaren"
 
-#: camel/providers/pop3/camel-pop3-folder.c:370
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og slЕ saman"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Mottek meldingar frЕ %1"
@@ -5604,7 +6837,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:50
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr ""
 
@@ -5684,7 +6917,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sendmail"
 msgstr "Send"
@@ -5738,7 +6971,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: 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:65
 msgid "SMTP"
 msgstr ""
 
@@ -5746,127 +6979,127 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Help message"
 msgstr "Lagra melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 #, fuzzy
 msgid "Service ready"
 msgstr "Skjul"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Ingen passord oppgitt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5874,129 +7107,129 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:594
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "MЬte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:766
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:938
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:969
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:988
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -6027,7 +7260,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:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 #, fuzzy
 msgid "attachment"
 msgstr "Vedlegg"
@@ -6066,7 +7299,7 @@ msgstr "MIME-type"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -6074,14 +7307,14 @@ msgstr "Legg adresse til adresseboka"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "FrЕ:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Svar"
@@ -6089,34 +7322,34 @@ msgstr "Svar"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn pЕ meldinga."
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 #, fuzzy
 msgid "Cc:"
 msgstr "&CC:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 #, fuzzy
 msgid "Bcc:"
 msgstr "&Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -6128,7 +7361,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:669
+#: composer/e-msg-composer.c:670
 #, fuzzy, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -6138,7 +7371,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: composer/e-msg-composer.c:682
+#: composer/e-msg-composer.c:683
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -6147,67 +7380,67 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: composer/e-msg-composer.c:872
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: composer/e-msg-composer.c:881
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Flyttar"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:878
 #, fuzzy
 msgid "File exists, overwrite?"
 msgstr "Loggfil eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:905
+#: composer/e-msg-composer.c:900
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:925
+#: composer/e-msg-composer.c:919
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:996
+#: composer/e-msg-composer.c:990
 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:1046
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1060
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1066
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1075
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -6216,13 +7449,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -6232,25 +7465,25 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: composer/e-msg-composer.c:1874 composer/e-msg-composer.c:2270
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:2364
+#: composer/e-msg-composer.c:2406
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Kan ikkje laga nytt vindauge.\n"
@@ -6298,161 +7531,88 @@ msgstr "Emne"
 
 #: default_user/searches.xml.h:4
 #, fuzzy
-msgid "Recipients contain"
-msgstr "Skildringar"
+msgid "Message contains"
+msgstr "SpЬrjinga inneheld"
 
 #: default_user/searches.xml.h:5
 #, fuzzy
-msgid "Subject contains"
-msgstr "Emne"
+msgid "Recipients contain"
+msgstr "Skildringar"
 
 #: default_user/searches.xml.h:6
 #, fuzzy
-msgid "Subject does not contain"
-msgstr "Emne"
-
-#: e-util/e-categories-config.c:64
-#, fuzzy
-msgid "Birthday"
-msgstr "FЬdselsdag:"
-
-#: e-util/e-categories-config.c:68
-#, fuzzy
-msgid "Competition"
-msgstr "FullfЬring"
-
-#: e-util/e-categories-config.c:70
-#, fuzzy
-msgid "Favorites"
-msgstr "Kategoriar"
-
-#: e-util/e-categories-config.c:72
-msgid "Gifts"
-msgstr ""
-
-#: e-util/e-categories-config.c:74
-msgid "Goals/Objectives"
-msgstr ""
-
-#: e-util/e-categories-config.c:76
-#, fuzzy
-msgid "Holiday"
-msgstr "i dag"
-
-#: e-util/e-categories-config.c:78
-msgid "Holiday Cards"
-msgstr ""
-
-#: e-util/e-categories-config.c:80
-#, fuzzy
-msgid "Hot Contacts"
-msgstr "&Innhald ..."
-
-#: e-util/e-categories-config.c:82
-#, fuzzy
-msgid "Ideas"
-msgstr " dag"
-
-#: e-util/e-categories-config.c:84
-#, fuzzy
-msgid "International"
-msgstr "Informasjon"
-
-#: e-util/e-categories-config.c:86
-#, fuzzy
-msgid "Key Customer"
-msgstr "Tilpass ..."
-
-#: e-util/e-categories-config.c:88
-msgid "Miscellaneous"
-msgstr ""
-
-#: e-util/e-categories-config.c:90
-msgid "Personal"
-msgstr ""
-
-#: e-util/e-categories-config.c:92
-#, fuzzy
-msgid "Phone Calls"
-msgstr "Telefonliste:"
-
-#: e-util/e-categories-config.c:96
-#, fuzzy
-msgid "Strategies"
-msgstr "Kategoriar"
-
-#: e-util/e-categories-config.c:98
-#, fuzzy
-msgid "Suppliers"
-msgstr "Rediger fil"
+msgid "Sender contains"
+msgstr "SpЬrjinga inneheld"
 
-#: e-util/e-categories-config.c:100
+#: default_user/searches.xml.h:7
 #, fuzzy
-msgid "Time & Expenses"
-msgstr "Tidssone"
-
-#: e-util/e-categories-config.c:102
-msgid "VIP"
-msgstr ""
+msgid "Subject contains"
+msgstr "Emne"
 
-#: e-util/e-categories-config.c:104
+#: default_user/searches.xml.h:8
 #, fuzzy
-msgid "Waiting"
-msgstr "Avsluttar ..."
+msgid "Subject does not contain"
+msgstr "Emne"
 
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 #, 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 #, 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: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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 #, 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: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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr ""
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr ""
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "Tx"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -6460,13 +7620,13 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:303
+#: e-util/e-time-utils.c:313
 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
+#: e-util/e-time-utils.c:322
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%H:%M"
@@ -6569,7 +7729,7 @@ msgstr "Vis hendingane for denne dagen"
 msgid "Compare against"
 msgstr "KompilatorЕtvaringar"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 #, fuzzy
 msgid "now"
 msgstr "nei"
@@ -6584,12 +7744,17 @@ msgstr "Tag"
 msgid "ago"
 msgstr "Tag"
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%H:%M"
+
+#: filter/filter-datespec.c:722
 #, fuzzy
 msgid "<click here to select a date>"
 msgstr "Trykk for Е velja ein skrifttype"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 #, fuzzy
 msgid "Filter Rules"
 msgstr "Filter-reglar"
@@ -6611,22 +7776,22 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:790
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 #, fuzzy
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 #, fuzzy
 msgid "<click here to select a folder>"
 msgstr "Trykk for Е velja ein skrifttype"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6639,79 +7804,69 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:633
+#: filter/filter-rule.c:626
 #, fuzzy
 msgid "Rule name: "
 msgstr "Filnamn:"
 
-#: filter/filter-rule.c:637
+#: filter/filter-rule.c:630
 #, fuzzy
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:647
 #, fuzzy
 msgid "If"
 msgstr "I"
 
-#: filter/filter-rule.c:672
+#: filter/filter-rule.c:665
 #, fuzzy
 msgid "Execute actions"
 msgstr "KЬyr autorun.sh"
 
-#: filter/filter-rule.c:676
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:681
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:692
+#: filter/filter-rule.c:685
 #, fuzzy
 msgid "Add criterion"
 msgstr "Legg til kriterium"
 
-#: filter/filter-rule.c:777
+#: filter/filter-rule.c:770
 #, fuzzy
 msgid "incoming"
 msgstr "Koding"
 
-#: filter/filter-rule.c:777
+#: filter/filter-rule.c:770
 #, fuzzy
 msgid "outgoing"
 msgstr "Oversikt"
 
-#: filter/filter.glade.h:1 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
-msgid "Edit"
-msgstr "Rediger"
-
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:1
 #, fuzzy
 msgid "Edit Filters"
 msgstr "Rediger fil"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "Rediger filterreglar"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 #, fuzzy
 msgid "Outgoing"
 msgstr "Oversikt"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "Mapper"
@@ -6738,222 +7893,223 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Mange fargar"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "contains"
-msgstr "Handlingar"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Date received"
 msgstr "Motta"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "Date sent"
 msgstr "Dato"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Deleted"
 msgstr "Slett"
 
-#: 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
-#, fuzzy
-msgid "does not exist"
-msgstr "Fila finst ikkje\n"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not sound like"
-msgstr "Fann ikkje fil"
-
-#: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "does not start with"
-msgstr "Kunne ikkje starta %1."
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "Fila finst ikkje\n"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Draft"
 msgstr "Kladd"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "Avslutt"
 
-#: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "exists"
-msgstr "Neste"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 #, fuzzy
 msgid "Expression"
 msgstr "&Yrke:"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 #, fuzzy
 msgid "Mailing list"
 msgstr "E-post&liste for sprЕket:"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 #, fuzzy
 msgid "Message Body"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 #, fuzzy
 msgid "Message Header"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Message was received"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Message was sent"
 msgstr "Lag meldingar og slЕ saman"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "on or after"
-msgstr "Slutt etter"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Read"
 msgstr "Tilfeldig"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 #, fuzzy
 msgid "Recipients"
 msgstr "Nyleg brukte fargar"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Replied to"
 msgstr "Svar til alle:"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1070
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 #, fuzzy
 msgid "Sender"
 msgstr "Send"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 #, fuzzy
 msgid "Set Status"
 msgstr "Status:"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Storleik (KB)"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:889
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
 
+#: filter/libfilter-i18n.h:36
+#, fuzzy
+msgid "contains"
+msgstr "Handlingar"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "does not exist"
+msgstr "Fila finst ikkje\n"
+
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "does not sound like"
+msgstr "Fann ikkje fil"
+
+#: filter/libfilter-i18n.h:41
+#, fuzzy
+msgid "does not start with"
+msgstr "Kunne ikkje starta %1."
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+#, fuzzy
+msgid "exists"
+msgstr "Neste"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "on or after"
+msgstr "Slutt etter"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr ""
+
 #: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "was after"
@@ -6987,14 +8143,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "Send"
@@ -7020,11 +8175,11 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7085,40 +8240,55 @@ msgstr "ьydelagd oppsettfil."
 msgid "Mail configuration interface"
 msgstr "Oppsett"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Fil alt i liste"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Endra namnet pЕ spelarane"
 
 #: mail/component-factory.c:757
 #, fuzzy
+msgid "New Mail Message"
+msgstr "Legg til melding"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Legg til melding"
+
+#: mail/component-factory.c:789
+#, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:261
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser-ui.c:258
+#: mail/folder-browser-ui.c:263
 #, fuzzy
 msgid "Properties"
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser.c:232 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -7126,156 +8296,160 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/folder-browser.c:900
+#: mail/folder-browser.c:909
 #, fuzzy
-msgid "Store search as vFolder"
-msgstr "Vel mappe"
+msgid "Create vFolder from Search"
+msgstr "Mapper"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1254
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1257
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Mappenamn:"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1260
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Mappa finst: "
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1263
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1269
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1272
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Fil under:"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1275
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1278
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1280
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "Resend"
-msgstr "Svar"
+msgid "_Edit as New Message..."
+msgstr "Private meldingar"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Save As..."
 msgstr "Lagra som ..."
 
-#: mail/folder-browser.c:1284 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 #, fuzzy
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Svar til avsendar:"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Svar til:"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Svar til alle:"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1304
 #, fuzzy
 msgid "_Forward"
 msgstr "Fram"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marker som lesen"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marker som lesen"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1318
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1320
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Kopier til mappe"
 
-#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Legg til i adresseboka"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1486
+#: mail/folder-browser.c:1496
 #, fuzzy
 msgid "Filter on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1487
+#: mail/folder-browser.c:1497
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1489
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1500
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Fil alt i liste"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Personleg informasjon"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -7341,17 +8515,17 @@ msgid "Evolution News Editor"
 msgstr "KDeelop-installering"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "KDeelop-installering"
 
-#: mail/mail-account-gui.c:980
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Vis sig&natur"
 
-#: mail/mail-account-gui.c:986
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -7361,42 +8535,47 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 #, fuzzy
 msgid " (default)"
 msgstr "Standard"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Skru av"
 
-#: mail/mail-accounts.c:176
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "pЕ"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 #, 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:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Slett"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 #, 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 Close button and title
-#: mail/mail-accounts.c:758
-msgid "Evolution Account Manager"
-msgstr ""
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "Skriftinnstillingar"
 
 #: mail/mail-autofilter.c:70
 #, fuzzy, c-format
@@ -7423,7 +8602,7 @@ msgstr "E-post&liste for sprЕket:"
 msgid "Add Filter Rule"
 msgstr "Filter-reglar"
 
-#: 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"
@@ -7431,30 +8610,30 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:218
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -7462,139 +8641,173 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:389
+#: mail/mail-callbacks.c:390
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
 #: mail/mail-callbacks.c:632
-#, fuzzy, c-format
-msgid "On %s, %s wrote:"
-msgstr "%D, skreiv %F:"
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:995
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:997
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:1353
+#: mail/mail-callbacks.c:1366
 #, 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:1375
+#: mail/mail-callbacks.c:1388
 #, 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:1409
+#: mail/mail-callbacks.c:1422
 #, 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:1421
+#: mail/mail-callbacks.c:1434
 #, 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:1442
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Ingen rektangel valt!"
 
-#: mail/mail-callbacks.c:1526
+#: mail/mail-callbacks.c:1540
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1528
+#: mail/mail-callbacks.c:1542
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1751
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+#, fuzzy
+msgid "Warning"
+msgstr "Flyttar"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Ikkje spЬr igjen"
+
+#: mail/mail-callbacks.c:1826
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:1761
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:1807
+#: mail/mail-callbacks.c:1882
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:1853
+#: mail/mail-callbacks.c:1928
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
-#: mail/mail-callbacks.c:1937
+#: mail/mail-callbacks.c:2012
 #, 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?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
-msgstr ""
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "KDeelop-installering"
+
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Innboks"
 
-#: mail/mail-config.c:1564
+#: mail/mail-config.c:1809
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1635 mail/mail-config.c:1638
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
@@ -7635,31 +8848,35 @@ msgstr ""
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Certificate ID:"
 msgstr "Dine SSL-sertifikat"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Ny melding"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7669,388 +8886,399 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Default Forward style is: "
 msgstr "Fjern ramme"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "Default character encoding: "
 msgstr "Standardteiknsett"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "Digital IDs..."
 msgstr "Detaljar ..."
 
 #: mail/mail-config.glade.h:26
 #, fuzzy
+msgid "Display"
+msgstr "Vis"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
 msgid "Done"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Kladd"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Lagra i &kladdemappe"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "E_nable"
 msgstr "pЕ"
 
-#: mail/mail-config.glade.h:30 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Sender ei melding til ein nettverksspelar"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Endra ..."
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "pЕ"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "&IMAP 4"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "Vinkel"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "NNTP-tenar:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "News"
 msgstr "Ny ..."
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Optional Information"
 msgstr "Personleg informasjon"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "E-post 2"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Val for oppkopling pЕ nytt"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Secure MIME"
 msgstr "Er sikker"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Tryggleik"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:70 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Type: "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Server requires _authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "Mapper"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "Standardfil"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "_Check for supported types"
 msgstr "Vel modemtype ..."
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "_Email Address:"
 msgstr "E-post-adresse:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "_Empty trash folders on exit"
 msgstr "TЬm papirkorg ved avslutting"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Fullt namn"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_Highlight citations with"
 msgstr "MerkingsvilkЕr"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Host:"
 msgstr "time/timar"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Lag meldingar og slЕ saman"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Name:"
 msgstr "Navn:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "_Path:"
 msgstr "Sti:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppfЬringa"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Send mail in HTML format by default."
 msgstr "Send meldingar:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "_Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Username:"
 msgstr "Brukarnamn:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "newswindow1"
 msgstr "Nytt vindauge"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "placeholder"
 msgstr "Bruk &plasshaldarar"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "seconds."
 msgstr "sekund"
@@ -8100,84 +9328,90 @@ 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:221
+#: mail/mail-display.c:222
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Lagra til disk"
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 #, fuzzy
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Opnar URL ..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Lagrar fil ..."
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Lagra bilete som"
 
-#: mail/mail-folder-cache.c:146
+#: mail/mail-folder-cache.c:147
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "Legg til &ny"
 
-#: mail/mail-folder-cache.c:152 mail/mail-folder-cache.c:159
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:153
+#: mail/mail-folder-cache.c:154
 #, fuzzy, c-format
 msgid "%d hidden"
 msgstr "gЬymt"
 
-#: mail/mail-folder-cache.c:162
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Slett"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "Legg til &ny"
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:172
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "(%1 totalt)"
@@ -8275,17 +9509,22 @@ msgstr ""
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:459
+#: mail/mail-local.c:330
 #, fuzzy, c-format
-msgid "Opening '%s'"
+msgid "No such folder /%s"
+msgstr "Vidaresendt melding"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Opnar URL ..."
 
-#: mail/mail-local.c:749
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:870
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -8326,6 +9565,11 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
 #: mail/mail-mt.c:796
 #, fuzzy
 msgid "Working"
@@ -8341,113 +9585,123 @@ msgstr "Les mapper"
 msgid "Fetching Mail"
 msgstr "Mottek e-post"
 
-#: mail/mail-ops.c:590
+#: mail/mail-ops.c:591
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:710
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:728
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:731 mail/mail-send-recv.c:506
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 #, fuzzy
 msgid "Complete."
 msgstr "Ferdig"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:823
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:916
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1028
+#: mail/mail-ops.c:1034
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1068 mail/mail-ops.c:1069
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 #, fuzzy
 msgid "Trash"
 msgstr "OppgЕve"
 
-#: mail/mail-ops.c:1203
+#: mail/mail-ops.c:1211
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: mail/mail-ops.c:1245 mail/mail-ops.c:1390
+#: mail/mail-ops.c:1253
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1316
+#: mail/mail-ops.c:1322
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Lagar ei ny mappe"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1590
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synkroniser"
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:1626
+#: mail/mail-ops.c:1639
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1688
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/mail-ops.c:1744
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1909
+#: mail/mail-ops.c:1921
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1947
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -8456,62 +9710,67 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:2009
+#: mail/mail-ops.c:2021
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-ops.c:2025
+#: mail/mail-ops.c:2037
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:2054
+#: mail/mail-ops.c:2068
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-ops.c:2123
+#: mail/mail-ops.c:2137
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frЕ ..."
 
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "SЬk"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "Ulest melding"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Ulest melding"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "Legg til melding"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "&Finn i melding ..."
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "Skil mellom store og smЕ bokstavar"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "30 sekund framover"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "Treff:"
@@ -8521,22 +9780,22 @@ msgstr "Treff:"
 msgid "Cancelling..."
 msgstr "Avbroten."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Send"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "Oppdater ..."
 
-#: mail/mail-send-recv.c:308 mail/mail-send-recv.c:359
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "Avsluttar ..."
 
-#: mail/mail-send-recv.c:502
+#: mail/mail-send-recv.c:494
 #, fuzzy
 msgid "Cancelled."
 msgstr "Avbroten."
@@ -8566,17 +9825,17 @@ msgstr "Vidaresendt melding frЕ %1"
 msgid "Forwarded message"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: mail/mail-vfolder.c:282
+#: mail/mail-vfolder.c:278
 #, fuzzy
 msgid "VFolders"
 msgstr "Mapper"
 
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:498
 #, fuzzy
 msgid "New VFolder"
 msgstr "Ny mappe"
@@ -8591,87 +9850,77 @@ msgstr "Fwd: (ingen emne)"
 msgid "%s - Message"
 msgstr "Legg til melding"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:636
 #, fuzzy
 msgid "Unseen"
 msgstr "partalssider"
 
-#: mail/message-list.c:628
+#: mail/message-list.c:637
 #, fuzzy
 msgid "Seen"
 msgstr "Send"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:630
+#: mail/message-list.c:639
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:640
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Lagra melding"
 
-#: mail/message-list.c:635
+#: mail/message-list.c:644
 #, fuzzy
 msgid "Lowest"
 msgstr "Senk"
 
-#: mail/message-list.c:636
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:649
 #, fuzzy
 msgid "Higher"
 msgstr "HЬgd"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:650
 #, fuzzy
 msgid "Highest"
 msgstr "1 (hЬgast)"
 
-#: mail/message-list.c:891
+#: mail/message-list.c:900
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:898
+#: mail/message-list.c:907
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%H:%M"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:928
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%H:%M"
 
-#: mail/message-list.c:927
-#, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%H:%M"
-
-#: mail/message-list.c:929
+#: mail/message-list.c:938
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: mail/message-list.c:2299
+#: mail/message-list.c:2312
 #, fuzzy
 msgid "Generating message list"
 msgstr "Melding"
 
-#: mail/message-list.c:2311
-#, fuzzy
-msgid "Updating message list"
-msgstr "Melding"
-
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
@@ -8685,40 +9934,79 @@ msgstr "Motta"
 msgid "Size"
 msgstr "Storleik"
 
-#: mail/subscribe-dialog.c:166
+#: mail/subscribe-dialog.c:174
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:267
+#: mail/subscribe-dialog.c:275
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:269
+#: mail/subscribe-dialog.c:277
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/subscribe-dialog.c:1190 shell/e-storage-set-view.etspec.h:1
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "Mapper"
 
-#: mail/subscribe-dialog.c:1410
+#: mail/subscribe-dialog.c:1490
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Inga hending valt."
 
-#: mail/subscribe-dialog.c:1467
+#: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
 msgstr ""
 
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Frisk opp lerret"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Alle kantar"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Visingsval:"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Skildring:"
+
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Kjelder"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Kjelder"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
 msgid "Evolution component for the executive summary."
@@ -8729,7 +10017,11 @@ msgstr "Kan ikkje initialisera lokale variablar"
 msgid "Factory for the Evolution executive summary component."
 msgstr "ьydelagd oppsettfil."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Kan ikkje initialisera lokale variablar"
@@ -8754,34 +10046,47 @@ msgstr "%H:%M"
 msgid "%a %l:%M%p"
 msgstr "%H:%M"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "oppsummering"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 #, fuzzy
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Legg til ei ny oppfЬring"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 #, fuzzy
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Oppgi namnet pЕ gruppa du vil leggja til."
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Navn:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Skriftinnstillingar"
+msgid "Summary Settings"
+msgstr "SpЬrjinga inneheld"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8794,6 +10099,11 @@ msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Diskusjonsgruppetenarar"
+
 #: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
@@ -8804,28 +10114,33 @@ msgstr "Ingen oppgЕver ..."
 msgid "My Weather"
 msgstr "Vatn"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Vatn"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Start om att"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %Y"
 msgstr "%1 bit %2 %3"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolution"
+msgid "Print Summary"
+msgstr "Samandrag"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "Feil ved skriving av band-ID."
 
 #: my-evolution/main.c:52
@@ -10188,136 +11503,146 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Legg til nytt bilete"
+msgid " _Remove"
+msgstr "Fjern"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Alle kantar"
+msgid "Add n_ew feed"
+msgstr "Legg til nytt bilete"
 
 #: my-evolution/my-evolution.glade.h:3
 #, fuzzy
-msgid "All news feeds:"
-msgstr "&Alle felt"
-
-#: my-evolution/my-evolution.glade.h:4
-#, fuzzy
-msgid "All stations:"
+msgid "Al_l stations:"
 msgstr "&Tilgjengelege handlingar:"
 
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:1023
+#: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "Calendar"
-msgstr "Skriv ut alle"
+msgid "All _folders:"
+msgstr "Alle kantar"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Skjermkontrollerarar"
+msgid "All news _feeds:"
+msgstr "&Alle felt"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Visingsval:"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
 #, fuzzy
-msgid "Displayed feeds:"
-msgstr "Vist namn:"
+msgid "Ma_x number of items shown:"
+msgstr "&HЬgste tal pЕ hopp:"
 
 #: my-evolution/my-evolution.glade.h:9
 #, fuzzy
-msgid "Five days"
-msgstr " dagar"
+msgid "News Feed Settings"
+msgstr "Nettverksinnstillingar"
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "Neste mЕnad"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "Veke"
 
 #: my-evolution/my-evolution.glade.h:12
 #, fuzzy
-msgid "Max number of items shown:"
-msgstr "&HЬgste tal pЕ hopp:"
+msgid "Refresh _time (seconds):"
+msgstr "&Oppfriskingsrate:"
 
 #: my-evolution/my-evolution.glade.h:13
 #, fuzzy
-msgid "News Feed Settings"
-msgstr "Nettverksinnstillingar"
+msgid "Show _all tasks"
+msgstr "Vedlegg"
 
 #: my-evolution/my-evolution.glade.h:14
 #, fuzzy
-msgid "News Feeds"
-msgstr "Diskusjonsgruppetenarar"
+msgid "Show _today's tasks"
+msgstr "Vedlegg"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr " dag"
+msgid "Tasks "
+msgstr "OppgЕver"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "Neste mЕnad"
+msgid "Units: "
+msgstr "Einingar"
 
 #: my-evolution/my-evolution.glade.h:17
 #, fuzzy
-msgid "One week"
-msgstr "Veke"
-
-#: my-evolution/my-evolution.glade.h:18
-#, fuzzy
-msgid "Refresh time (seconds):"
-msgstr "&Oppfriskingsrate:"
+msgid "Weather settings"
+msgstr "Toppinnstillingar"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr "&Plan"
+msgid "_Display folders:"
+msgstr "Skjermkontrollerarar"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Vedlegg"
+msgid "_Display stations:"
+msgstr "Visingsval:"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "Vis sidekantar"
+msgid "_Displayed feeds:"
+msgstr "Vist namn:"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Vedlegg"
+msgid "_Five days"
+msgstr " dagar"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "OppgЕver"
+msgid "_Mail"
+msgstr "Send"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr "Einingar"
+msgid "_News Feeds"
+msgstr "Diskusjonsgruppetenarar"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Vatn"
+msgid "_One day"
+msgstr " dag"
 
 #: my-evolution/my-evolution.glade.h:26
 #, fuzzy
-msgid "Weather settings"
-msgstr "Toppinnstillingar"
+msgid "_Refresh time (seconds):"
+msgstr "&Oppfriskingsrate:"
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "seriell"
+msgid "_Schedule"
+msgstr "&Plan"
 
 #: my-evolution/my-evolution.glade.h:28
 #, fuzzy
-msgid "metric"
+msgid "_Show full path for folders"
+msgstr "Vis sidekantar"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Vatn"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "seriell"
+
+#: my-evolution/my-evolution.glade.h:31
+#, fuzzy
+msgid "m_etric"
 msgstr "Geometrisk"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -10335,7 +11660,15 @@ msgstr "Vis detaljar"
 msgid "Cancel Operation"
 msgstr "&Avbryt operasjon"
 
-#: shell/e-local-storage.c:551
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr "Innboks"
+
+#: shell/e-local-storage.c:178
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Mapper"
@@ -10388,7 +11721,7 @@ msgid ""
 "`%s'."
 msgstr "Ein feil oppstod ved lagring."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -10396,7 +11729,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -10405,7 +11738,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -10428,50 +11761,57 @@ msgstr "kan ikkje opna fila %1"
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Kopier til mappe"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Vel filter"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:377
+#: shell/e-shell-folder-commands.c:384
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Er du sikker pЕ at du vil sletta denne mappa?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:450
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "Endra namn pЕ profil '%1'"
 
-#: shell/e-shell-folder-commands.c:454 shell/e-shortcuts-view.c:412
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "OmdЬyp"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:462
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -10502,11 +11842,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Ny ..."
 
-#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Utan tittel"
@@ -10537,7 +11877,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -10587,7 +11927,7 @@ msgstr "Automatisk"
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 #, fuzzy
 msgid "Select a file"
 msgstr "Signaturfil:"
@@ -10597,11 +11937,11 @@ msgstr "Signaturfil:"
 msgid "File type:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
@@ -10610,324 +11950,335 @@ msgstr ""
 msgid "Closing connections..."
 msgstr "Lukkar prosjekt ..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Kan ikkje initialisera adresseboka"
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Opphavsrett (c), %1 1997-2000"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 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:437
+#: shell/e-shell-view-menu.c:423
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 #, fuzzy
 msgid "Select the folder that you want to open"
 msgstr "Vel det ikontemaet du vil bruka:"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel katalogen som inneheld tenestene"
 
-#: shell/e-shell-view-menu.c:702
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "Flyttar"
 
-#: shell/e-shell-view-menu.c:715 shell/e-shell-view-menu.c:728
-#: ui/evolution.xml.h:35
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Work Offline"
 msgstr "Flyttar"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1380
+#: shell/e-shell-view.c:1459
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1382
+#: shell/e-shell-view.c:1461
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1420
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1427
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1433
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:489
+#: shell/e-shell.c:509
 #, fuzzy, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1393
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell.c:1579 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: shell/e-shell.c:1581
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1583
+#: shell/e-shell.c:1646
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1585
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1587 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 #, fuzzy
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-shortcuts-view.c:101
+#: shell/e-shortcuts-view.c:72
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Endra snarveg for:"
 
-#: shell/e-shortcuts-view.c:102
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Gruppenamn:"
 
-#: shell/e-shortcuts-view.c:200
+#: shell/e-shortcuts-view.c:171
 #, fuzzy, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr "Vil du verkeleg leggja '%1' i papirkorga?"
 
-#: shell/e-shortcuts-view.c:205
+#: shell/e-shortcuts-view.c:176
 #, fuzzy
 msgid "Don't remove"
 msgstr "fjern"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Fjern denne oppfЬringa"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Fjern denne oppfЬringa"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:218
 #, fuzzy
 msgid "_Small Icons"
 msgstr "SmЕ ikon"
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:221
 #, fuzzy
 msgid "_Large Icons"
 msgstr "Ordna ikon"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:233
 #, fuzzy
 msgid "_New Group..."
 msgstr "Ny gruppe ..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:234
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:237
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Fjern denne oppfЬringa"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Fjern denne oppfЬringa"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "&ProgramsnЬggtastar"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Endra portnamn"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:366
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "&Merka tekst"
 
-#: shell/e-shortcuts-view.c:407 ui/evolution-message-composer.xml.h:13
-#, fuzzy
-msgid "Open"
-msgstr "Opna ..."
-
-#: shell/e-shortcuts-view.c:407
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:409 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New Window"
 msgstr "&Opna i eige vindauge"
 
-#: shell/e-shortcuts-view.c:409
+#: shell/e-shortcuts-view.c:380
 #, 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:412
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Fjern denne oppfЬringa"
 
-#: shell/e-shortcuts-view.c:414
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:619
+#: shell/e-shortcuts.c:641
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: shell/e-shortcuts.c:1018
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-shortcuts.c:1022
-msgid "Inbox"
-msgstr "Innboks"
-
-#: shell/e-shortcuts.c:1025
-#, fuzzy
-msgid "Contacts"
-msgstr "&Innhald ..."
-
-#: shell/e-storage-set-view.c:1486
-#, fuzzy
-msgid "My Evolution"
-msgstr "Evolution"
-
 #: shell/e-storage.c:182 shell/e-storage.c:188
 #, fuzzy
 msgid "(No name)"
 msgstr "Ingen namn"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 #, fuzzy
 msgid "No error"
 msgstr "Ingen feil."
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 #, fuzzy
 msgid "I/O error"
 msgstr "IU-feil"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip Е senda."
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje stЬtta pЕ tenar"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "%1 av %2 ferdig"
@@ -10966,18 +12317,27 @@ msgstr ""
 
 #: shell/importer/import.glade.h:2
 #, fuzzy
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr "KDeelop-installering"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Utility"
+msgid "Evolution Importer Assistant"
 msgstr "KDeelop-installering"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Signaturfil:"
+
 #: 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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -10998,7 +12358,7 @@ msgstr "Ikkje spЬr igjen"
 
 #: shell/importer/intelligent.c:209
 #, fuzzy
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr "Bruk pЕ fЬlgjande delar:"
 
 #: shell/main.c:95
@@ -11024,32 +12384,32 @@ msgid ""
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:154
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:163
+#: shell/main.c:184
 #, fuzzy, c-format
 msgid "Cannot initialize the Evolution shell: %s"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:221
+#: shell/main.c:228
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "KDE-oppstartsskjermen."
 
-#: shell/main.c:222
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:261
+#: shell/main.c:271
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopier"
 
@@ -11068,11 +12428,11 @@ msgstr "Lagar eit nytt dokument"
 msgid "Create new contact list"
 msgstr "Lagar eit nytt dokument"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Cut the selection"
 msgstr "Slettar den valte fila"
@@ -11082,58 +12442,48 @@ msgstr "Slettar den valte fila"
 msgid "Delete selected contacts"
 msgstr "Slett den valte oppgЕva"
 
-#: ui/evolution-addressbook.xml.h:10
-#, fuzzy
-msgid "New contact"
-msgstr "Se&nd avtale"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Ny liste"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lim inn"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Limer inn ..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Slett den valte oppgЕva"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 #, fuzzy
 msgid "Select All"
 msgstr "Vel mappe"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Slett kolonne"
 
-#: ui/evolution-addressbook.xml.h:22
-#, fuzzy
-msgid "Send _contact to other"
-msgstr "Send svar til ..."
-
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
 #, fuzzy
-msgid "Send _message to contact"
+msgid "Send _Message to Contact..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
 #: ui/evolution-addressbook.xml.h:24
@@ -11141,45 +12491,59 @@ msgstr "Sender ei melding til ein nettverksspelar"
 msgid "Send a mess to the selected contacts."
 msgstr "Slett den valte oppgЕva"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Sender ei melding til ein nettverksspelar"
+
+#: ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Stop"
 msgstr "Poengsum"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "Stop Loading"
 msgstr "Lagring"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
 #, fuzzy
 msgid "_Actions"
 msgstr "Handlingar"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Kjelde:"
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Contact"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:35
-#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "&Innhald ..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 #, fuzzy
 msgid "_Print..."
 msgstr "Skriv ut"
@@ -11190,16 +12554,19 @@ msgid "_Save as VCard"
 msgstr "Lagra som"
 
 #: ui/evolution-addressbook.xml.h:38
-msgid "_Search for contacts"
-msgstr ""
+#, fuzzy
+msgid "_Search for Contacts"
+msgstr "Slett kolonne"
 
 #: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Select All"
 msgstr "Vel mappe"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution.xml.h:59
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 #, fuzzy
 msgid "_Tools"
 msgstr "VerktЬy"
@@ -11210,131 +12577,138 @@ msgstr ""
 
 #: 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:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "&Slett avtale"
+msgid "Create a New _Task"
+msgstr "Lagar eit nytt dokument"
 
 #: ui/evolution-calendar.xml.h:6
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "Dag"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "&Slett avtale"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "GЕ til side"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:14
 #, fuzzy
-msgid "Go back in time"
+msgid "Go back"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
-msgid "Go forward in time"
+msgid "Go forward"
 msgstr "Fram"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to _Date"
 msgstr "GЕ til side"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Go to a specific date"
 msgstr "GЕ til side"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
-msgid "Go to present time"
-msgstr "Ikkje vis den overskytande teksten"
+msgid "Go to today"
+msgstr "GЕ til &i dag"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+msgid "Month"
+msgstr "MЕnad"
+
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "New Appointment"
 msgstr "&Vis avtale ..."
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+#, fuzzy
+msgid "New Task"
+msgstr "OppgЕve"
+
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 #, fuzzy
-msgid "Print calendar"
-msgstr "Skriv ut alle"
+msgid "Print Pre_view"
+msgstr "&FЬrehandsvising ..."
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Print this Calendar"
+msgid "Print this calendar"
 msgstr "Skriv ut alle"
 
-#: ui/evolution-calendar.xml.h:22
-#, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "Informasjon"
-
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
-msgid "Show 1 day"
+msgid "Show one day"
 msgstr "Vis dato"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "Show 1 month"
+msgid "Show one month"
 msgstr "Vis metodar"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 #, fuzzy
-msgid "Show 1 week"
+msgid "Show one week"
 msgstr "Vis %1"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "Show the working week"
 msgstr "Vis hovudvindauget"
 
-#: ui/evolution-calendar.xml.h:28
-#, fuzzy
-msgid "W_ork Week"
-msgstr "&Arbeidsveke"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "Veke"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "Avtale"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "Skriftinnstillingar"
 
-#: ui/evolution-calendar.xml.h:32
-#, fuzzy
-msgid "_Day"
-msgstr "Dag"
-
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:41
 #, fuzzy
-msgid "_Month"
-msgstr "MЕnad"
+msgid "_Publish Free/Busy Information"
+msgstr "Informasjon"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
-msgid "_Week"
-msgstr "Veke"
+msgid "_Task..."
+msgstr "OppgЕve"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -11347,16 +12721,16 @@ msgstr "Lukk"
 
 #: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
-msgid "Close this appointment"
-msgstr "&Slett avtale"
+msgid "Close this item"
+msgstr "Slett denne adressa"
 
-#: ui/evolution-comp-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 #, fuzzy
-msgid "Delete this appointment"
-msgstr "&Slett avtale"
+msgid "Delete this item"
+msgstr "Slett denne adressa"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr ""
 
@@ -11365,128 +12739,91 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Sen melding"
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
-#, fuzzy
-msgid "Print Pre_view"
-msgstr "&FЬrehandsvising ..."
-
-#: ui/evolution-comp-editor.xml.h:11
-#, fuzzy
-msgid "Print S_etup"
-msgstr "Speloppsett"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 #, fuzzy
 msgid "Print this item"
 msgstr "Skriv til fil"
 
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11
 #, fuzzy
 msgid "Print..."
 msgstr "Skriv ut"
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Lagra"
+
+#: ui/evolution-comp-editor.xml.h:14
 #, fuzzy
 msgid "Save and Close"
 msgstr "Lagra ei fil"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, fuzzy
 msgid "Save this item to disk"
 msgstr "Lagra til disk"
 
-#: 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 "Handlingar"
-
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_File"
 msgstr "Fil"
 
-#: ui/evolution-contact-editor.xml.h:3
-#, fuzzy
-msgid "Delete this item"
-msgstr "Slett denne adressa"
-
-#: ui/evolution-contact-editor.xml.h:4
-#, fuzzy
-msgid "Help"
-msgstr "Heim"
-
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Private meldingar"
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Lagra som ..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-#, fuzzy
-msgid "See online help"
-msgstr "Me er tilkopla!"
-
-#: ui/evolution-contact-editor.xml.h:13
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "Sender ei melding til ein nettverksspelar"
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "Lagra"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Slett denne adressa"
 
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 #, fuzzy
 msgid "Delete..."
 msgstr "Slett"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "Send svar til ..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "Sender ei melding til ein nettverksspelar"
@@ -11496,22 +12833,22 @@ msgstr "Sender ei melding til ein nettverksspelar"
 msgid "Cancel Mee_ting"
 msgstr "KЬyreplan ..."
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 #, fuzzy
 msgid "Cancel the meeting for this item"
 msgstr "Lagra val for denne verten."
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Fort framover"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Vidaresendt melding"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 #, fuzzy
 msgid "Obtain the latest meeting information"
 msgstr "generer avlusingsinformasjon"
@@ -11526,7 +12863,7 @@ msgstr "Oppfriskingstid"
 msgid "Schedule _Meeting"
 msgstr "KЬyreplan ..."
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "KЬyreplan ..."
@@ -11547,40 +12884,40 @@ msgstr "Snur om pЕ merkinga"
 
 #: ui/evolution-mail-global.xml.h:3
 #, fuzzy
-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
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 #, fuzzy
 msgid "Empty _Trash"
 msgstr " dag"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 #, fuzzy
 msgid "Forget _Passwords"
 msgstr "Lagra som"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Legg til melding"
+
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
@@ -11612,32 +12949,32 @@ msgstr ""
 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"
 
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:24
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Leitar etter tilleggsmodular"
@@ -11647,98 +12984,103 @@ msgstr "Leitar etter tilleggsmodular"
 msgid "Change the properties of this folder"
 msgstr "Endra namnet pЕ spelarane"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Klipp ut"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Neste melding"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Mar&ker som ulesen"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "Lag meldingar og slЕ saman"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Limer inn ..."
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Kontroller stavinga til alle dei omsette programtekstane i fila."
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 #, fuzzy
 msgid "Select _All"
 msgstr "Vel mappe"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
 msgid "Select _Thread"
 msgstr "Vel mappe"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Merk alle meldingane"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 #, fuzzy
-msgid "Show _All"
+msgid "Sh_ow Hidden Messages"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Vidaresendt melding frЕ %1"
@@ -11747,7 +13089,7 @@ msgstr "Vidaresendt melding frЕ %1"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:45
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Folder"
 msgstr "Mapper"
@@ -11757,12 +13099,12 @@ msgstr "Mapper"
 msgid "_Invert Selection"
 msgstr "Slettar den valte fila"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
 msgid "_Properties..."
 msgstr "Eigenskapar ..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Vidaresendt melding frЕ %1"
@@ -12024,7 +13366,7 @@ msgstr "Kopierer det merkte omrЕdet til utklippstavla"
 
 #: ui/evolution-mail-message.xml.h:58
 #, fuzzy
-msgid "Previews the message to be printed"
+msgid "Preview the message to be printed"
 msgstr "Sen melding"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -12046,45 +13388,39 @@ msgstr "Private meldingar"
 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:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "&FЬrehandsvising ..."
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Private meldingar"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Reply to All"
 msgstr "Svar til alle:"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "SЬk i &meldingar ..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen pЕ ruta her."
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
@@ -12135,50 +13471,45 @@ msgstr "Mappa finst: "
 msgid "VFolder on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "Rediger fil"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Vidaresendt melding"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Endra tidsvising"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Vis"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "Send melding"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "Send melding"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close this window"
@@ -12187,13 +13518,13 @@ msgstr "&Slett avtale"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Close"
 msgstr "Lukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:60
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 #, fuzzy
 msgid "_View"
 msgstr "Vis"
@@ -12268,11 +13599,6 @@ msgstr "&Krypter"
 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 "Lagra"
-
 #: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
@@ -12420,7 +13746,7 @@ msgstr "Svar"
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:48
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Help"
 msgstr "Heim"
@@ -12457,16 +13783,30 @@ msgstr ""
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "Mange fargar"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "Avbryt"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Slettar oppgЕve"
+msgid "Cancel this task"
+msgstr "Avbryt"
 
 #: ui/evolution-task-editor.xml.h:7
 #, fuzzy
+msgid "Obtain the latest task information"
+msgstr "generer avlusingsinformasjon"
+
+#: ui/evolution-task-editor.xml.h:8
+#, fuzzy
 msgid "Re_fresh Task"
 msgstr "Frisk opp lerret"
 
@@ -12474,46 +13814,32 @@ msgstr "Frisk opp lerret"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Slett den valte oppgЕva"
 
-#: ui/evolution-tasks.xml.h:4
-#, fuzzy
-msgid "Create a new task"
-msgstr "Lagar eit nytt dokument"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Slett den valte oppgЕva"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, 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:9
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgЕve eller variabel frЕ utklippstavla."
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr ""
-
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "Skriftinnstillingar"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Task"
 msgstr "OppgЕve"
@@ -12582,174 +13908,143 @@ msgid "Exit the program"
 msgstr ""
 
 #: ui/evolution.xml.h:16
-#, fuzzy
-msgid "Getting _Started"
-msgstr "Starta"
-
-#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Bruk denne tekstboksen for Е kommentera tittelen"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "&Opna i eige vindauge"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Opna filer i nytt vindauge"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "Byt"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "&ProgramsnЬggtastar"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Using the C_ontact Manager"
-msgstr "Skriv ut alle"
-
-#: ui/evolution.xml.h:32
-#, fuzzy
-msgid "Using the _Calendar"
-msgstr "Skriv ut alle"
-
-#: ui/evolution.xml.h:33
-#, fuzzy
-msgid "Using the _Mailer"
-msgstr "Skriv ut alle"
-
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Slettar den valte fila"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "OpplЬysing"
 
-#: ui/evolution.xml.h:38
-#, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "Avtale"
-
-#: ui/evolution.xml.h:40
-#, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "Comment=X-redigering"
-
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "&Kopier ..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "Mapper"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Flytt til mappe"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:42
 #, fuzzy
-msgid "_Import file..."
+msgid "_Import File..."
 msgstr "Sett inn fil ..."
 
-#: ui/evolution.xml.h:50
-#, fuzzy
-msgid "_Index"
-msgstr "Set inn"
-
-#: ui/evolution.xml.h:51
-#, fuzzy
-msgid "_Mail message"
-msgstr "Legg til melding"
-
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "&Flytt ..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_New"
 msgstr "Vis"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_New Folder"
 msgstr "Ny mappe"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "OmdЬyp ..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Snarveg"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:58
-#, fuzzy
-msgid "_Task (FIXME)"
-msgstr "Comment=X-redigering"
-
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Flyttar"
 
 #: ui/my-evolution.xml.h:1
 #, fuzzy
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr "Fargar og innstillingar for HTML-eksport"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr "oppsummering"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Tilfeldig"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
 msgstr "Skriftinnstillingar"
 
 #: views/addressbook/galview.xml.h:1
@@ -12791,6 +14086,27 @@ msgstr "Meldingar"
 msgid "With Category"
 msgstr "Kategori"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Vel ei biletefil"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Utval:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "Tidssone"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -12883,7 +14199,7 @@ msgstr "Kontaktar"
 msgid "_Current View"
 msgstr "tid no"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 #, fuzzy
 msgid "Define Views"
 msgstr "Detaljert oversikt"
@@ -12894,17 +14210,23 @@ msgstr "Detaljert oversikt"
 msgid "MTWTFSS"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+#, fuzzy
+msgid "%B %Y"
+msgstr "%1 %2"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 #, fuzzy
 msgid "Now"
 msgstr "&No"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 #, fuzzy
 msgid "Today"
 msgstr "i dag"
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ein bandindeks mЕ vera valt i treet."
@@ -12993,17 +14315,27 @@ msgstr "Datakoding"
 msgid "..."
 msgstr " ..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "Comment=X-redigering"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 #, fuzzy
 msgid "Save Search"
 msgstr "SЬk"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "SЬk"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Skriv ut alle"
+
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr ""
 
@@ -13012,11 +14344,6 @@ msgstr ""
 msgid "Information"
 msgstr "Informasjon"
 
-#: widgets/misc/e-messagebox.c:159
-#, fuzzy
-msgid "Warning"
-msgstr "Flyttar"
-
 #: widgets/misc/e-messagebox.c:166
 #, fuzzy
 msgid "Error"
@@ -13038,15 +14365,15 @@ msgstr "Legg til melding"
 msgid "Don't show this message again."
 msgstr "Sen melding"
 
-#: widgets/misc/e-search-bar.c:180
+#: widgets/misc/e-search-bar.c:334
 #, fuzzy
 msgid "Sear_ch"
 msgstr "SЬk"
 
-#: widgets/misc/e-search-bar.c:272
+#: widgets/misc/e-search-bar.c:460
 #, fuzzy
-msgid "Activate"
-msgstr "Privat"
+msgid "Find Now"
+msgstr "Finn:"
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
@@ -13075,6 +14402,338 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
 
 #, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Samandrag"
+
+#, fuzzy
+#~ msgid "LDAP Server"
+#~ msgstr "Tenar:"
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "Fil"
+
+#, fuzzy
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Kan ikkje opna adresseboka."
+
+#, fuzzy
+#~ msgid "Unknown auth type"
+#~ msgstr "Ukjend feil"
+
+#, fuzzy
+#~ msgid "Subtree"
+#~ msgstr "Kjelder"
+
+#, fuzzy
+#~ msgid "Host:"
+#~ msgstr "time/timar"
+
+#, fuzzy
+#~ msgid "Root DN:"
+#~ msgstr "Rot"
+
+#~ msgid "Authentication:"
+#~ msgstr "Autentisering:"
+
+#, fuzzy
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "Avanserte kISDN-val"
+
+#~ msgid "Path:"
+#~ msgstr "Sti:"
+
+#, fuzzy
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Fila finst ikkje\n"
+
+#~ msgid "Name"
+#~ msgstr "Namn"
+
+#, fuzzy
+#~ msgid "URI"
+#~ msgstr "URL"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "SpЬrjinga inneheld"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "Vel ei gruppe fЬrst."
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Avbroten."
+
+#, fuzzy
+#~ msgid "Unfiled"
+#~ msgstr "Utan tittel"
+
+#, fuzzy
+#~ msgid "Calendar Preferences"
+#~ msgstr "Innstillingar"
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Delegert"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Ingen"
+
+#~ msgid "Task"
+#~ msgstr "OppgЕve"
+
+#, fuzzy
+#~ msgid "% Comp_lete:"
+#~ msgstr "Ferdig"
+
+#, fuzzy
+#~ msgid "This is an event that can be added to your calendar."
+#~ msgstr "Dette er ei topptekstramme - ho kan ikkje slettast."
+
+#, fuzzy
+#~ msgid "This is a meeting request."
+#~ msgstr "Dette er ei repeterande hending."
+
+#, fuzzy
+#~ msgid "This is one or more additions to a current meeting."
+#~ msgstr ""
+#~ "Dette er fЬrste nivЕ\n"
+#~ "i denne samlinga."
+
+#, fuzzy
+#~ msgid "This is a request for the latest event information."
+#~ msgstr "Dette er ei fЬrehandsvising av det valte bakgrunnsbiletet."
+
+#, fuzzy
+#~ msgid "This is an event cancellation."
+#~ msgstr ""
+#~ "Dette er det siste nivЕet\n"
+#~ "i denne samlinga."
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Meldinga har ingen sendar"
+
+#, fuzzy
+#~ msgid "This is a task request."
+#~ msgstr "Dette er ei repeterande hending."
+
+#, fuzzy
+#~ msgid "This is a reply to a task request."
+#~ msgstr ""
+#~ "Dette er ein katalog og inga fil:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Meldinga har ingen sendar"
+
+#, fuzzy
+#~ msgid "Birthday"
+#~ msgstr "FЬdselsdag:"
+
+#, fuzzy
+#~ msgid "Competition"
+#~ msgstr "FullfЬring"
+
+#, fuzzy
+#~ msgid "Favorites"
+#~ msgstr "Kategoriar"
+
+#, fuzzy
+#~ msgid "Holiday"
+#~ msgstr "i dag"
+
+#, fuzzy
+#~ msgid "Hot Contacts"
+#~ msgstr "&Innhald ..."
+
+#, fuzzy
+#~ msgid "International"
+#~ msgstr "Informasjon"
+
+#, fuzzy
+#~ msgid "Key Customer"
+#~ msgstr "Tilpass ..."
+
+#, fuzzy
+#~ msgid "Phone Calls"
+#~ msgstr "Telefonliste:"
+
+#, fuzzy
+#~ msgid "Strategies"
+#~ msgstr "Kategoriar"
+
+#, fuzzy
+#~ msgid "Suppliers"
+#~ msgstr "Rediger fil"
+
+#, fuzzy
+#~ msgid "Time & Expenses"
+#~ msgstr "Tidssone"
+
+#, fuzzy
+#~ msgid "Waiting"
+#~ msgstr "Avsluttar ..."
+
+#~ msgid "Add"
+#~ msgstr "Legg til"
+
+#~ msgid "Edit"
+#~ msgstr "Rediger"
+
+#, fuzzy
+#~ msgid "Store search as vFolder"
+#~ msgstr "Vel mappe"
+
+#, fuzzy
+#~ msgid "Resend"
+#~ msgstr "Svar"
+
+#, fuzzy
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "%D, skreiv %F:"
+
+#, fuzzy
+#~ msgid "Updating message list"
+#~ msgstr "Melding"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Skriftinnstillingar"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Feil ved skriving av band-ID."
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "New contact"
+#~ msgstr "Se&nd avtale"
+
+#, fuzzy
+#~ msgid "Send _contact to other"
+#~ msgstr "Send svar til ..."
+
+#, fuzzy
+#~ msgid "Send _message to contact"
+#~ msgstr "Sender ei melding til ein nettverksspelar"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "&Innhald ..."
+
+#, fuzzy
+#~ msgid "Go to present time"
+#~ msgstr "Ikkje vis den overskytande teksten"
+
+#, fuzzy
+#~ msgid "W_ork Week"
+#~ msgstr "&Arbeidsveke"
+
+#, fuzzy
+#~ msgid "_Day"
+#~ msgstr "Dag"
+
+#, fuzzy
+#~ msgid "_Month"
+#~ msgstr "MЕnad"
+
+#, fuzzy
+#~ msgid "_Week"
+#~ msgstr "Veke"
+
+#, fuzzy
+#~ msgid "Close this appointment"
+#~ msgstr "&Slett avtale"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "Speloppsett"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "Handlingar"
+
+#, fuzzy
+#~ msgid "Help"
+#~ msgstr "Heim"
+
+#, fuzzy
+#~ msgid "See online help"
+#~ msgstr "Me er tilkopla!"
+
+#, fuzzy
+#~ msgid "Show _All"
+#~ msgstr "Vidaresendt melding frЕ %1"
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "&FЬrehandsvising ..."
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "Send melding"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Slettar oppgЕve"
+
+#, fuzzy
+#~ msgid "Getting _Started"
+#~ msgstr "Starta"
+
+#, fuzzy
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Skriv ut alle"
+
+#, fuzzy
+#~ msgid "Using the _Calendar"
+#~ msgstr "Skriv ut alle"
+
+#, fuzzy
+#~ msgid "Using the _Mailer"
+#~ msgstr "Skriv ut alle"
+
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "Avtale"
+
+#, fuzzy
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "Comment=X-redigering"
+
+#, fuzzy
+#~ msgid "_Index"
+#~ msgstr "Set inn"
+
+#, fuzzy
+#~ msgid "_Mail message"
+#~ msgstr "Legg til melding"
+
+#, fuzzy
+#~ msgid "_Task (FIXME)"
+#~ msgstr "Comment=X-redigering"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Skriftinnstillingar"
+
+#, fuzzy
+#~ msgid "Activate"
+#~ msgstr "Privat"
+
+#, fuzzy
 #~ msgid "Transparent"
 #~ msgstr "Gjennomsiktig "
 
@@ -13106,26 +14765,14 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgstr "Gjennomsiktig "
 
 #, fuzzy
-#~ msgid "_Go To Today"
-#~ msgstr "GЕ til &i dag"
-
-#, fuzzy
 #~ msgid "Receiving"
 #~ msgstr "Motta"
 
 #, fuzzy
-#~ msgid "Sending"
-#~ msgstr "Sender %1"
-
-#, fuzzy
 #~ msgid "Store"
 #~ msgstr "Poengsum"
 
 #, fuzzy
-#~ msgid "Manage Subscriptions"
-#~ msgstr "Skildring:"
-
-#, fuzzy
 #~ msgid "Manage _Subscriptions..."
 #~ msgstr "Skildring:"
 
@@ -13165,18 +14812,10 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgstr "Leitar etter tilleggsmodular"
 
 #, fuzzy
-#~ msgid "Sender contains"
-#~ msgstr "SpЬrjinga inneheld"
-
-#, fuzzy
 #~ msgid "Forward to Address"
 #~ msgstr "Vidaresendt melding"
 
 #, fuzzy
-#~ msgid "Creating new folder"
-#~ msgstr "Lagar ei ny mappe"
-
-#, fuzzy
 #~ msgid "Copying messages"
 #~ msgstr "Melding"
 
@@ -13234,12 +14873,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ 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 ..."
@@ -13256,9 +14889,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgid "Settings..."
 #~ msgstr "Skriftinnstillingar"
 
-#~ msgid "Week"
-#~ msgstr "Veke"
-
 #, fuzzy
 #~ msgid "_Open Calendar"
 #~ msgstr "Feil ved opning"
diff --git a/po/no.po b/po/no.po
index 66c61dea81..30231dd0a3 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets 1.4.1\n"
-"POT-Creation-Date: 2001-08-22 20:50+0200\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2001-08-22 20:53+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -540,7 +540,7 @@ msgstr "_Legg til"
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "R_ediger"
 
@@ -656,18 +656,18 @@ 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:1599
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "PrimФr e-post"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
 #: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "E-post 3"
@@ -690,19 +690,19 @@ msgstr "Legg til adresse for eksisterende kontakt \"%s\""
 msgid "Querying Addressbook..."
 msgstr "KjЬrer spЬrring i adressebok..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Rediger kontaktinfo"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Legg til i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "Flett E-postadresse"
 
@@ -864,7 +864,7 @@ msgstr "_Kontakter..."
 #: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
 #: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:36
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -917,14 +917,6 @@ msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Er du sikker pЕ at du vil\n"
-"slette denne kontakten?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
@@ -932,94 +924,99 @@ msgstr "Slett kontakt?"
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hЬrer til disse kategoriene:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
 #: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1558
-#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1559
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1560
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
 #: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Faks pЕ arbeid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/contact-editor/e-contact-editor.c:1626
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
 #: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
 #: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
 #: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
 #: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
 #: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "PersonsЬker"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "PrimФr"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
 #: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
 #: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
@@ -1037,7 +1034,7 @@ msgstr "Fullt navn"
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:142
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2326,7 +2323,7 @@ msgstr "Suksess"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
 #: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
-#: shell/e-storage.c:503
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -2334,7 +2331,7 @@ msgstr "Ukjent feil"
 msgid "Repository offline"
 msgstr "Lager \"offline\""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
@@ -3786,7 +3783,7 @@ msgid "Pu_blic"
 msgstr "Of_fentlig"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -3928,45 +3925,41 @@ msgid "Attendee"
 msgstr "Deltaker"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klikk her for Е legge til en deltaker"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
 msgid "Common Name"
 msgstr "Vanlig navn"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegert fra"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegert til"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
 msgid "Language"
 msgstr "SprЕk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
 msgid "Member"
 msgstr "Medlem"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
 msgid "Role"
 msgstr "Rolle"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15 filter/libfilter-i18n.h:31
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18 mail/mail-config.glade.h:85
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4242,7 +4235,6 @@ msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
 #: calendar/gui/e-calendar-table.c:1130
-#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikk for Е legge til en oppgave"
 
@@ -4254,48 +4246,48 @@ msgstr "Alarmer"
 msgid "Categories"
 msgstr "Kategorier"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:699
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
 #: camel/camel-filter-driver.c:815
 msgid "Complete"
 msgstr "FullfЬrt"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "FullfЬrt dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Ferdig-dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geografisk plassering"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Startdato"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
 #: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Oppgavesortering"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4653,7 +4645,7 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr "En organisator mЕ oppgis."
 
@@ -7200,11 +7192,6 @@ msgstr "en tid du spesifiserer"
 msgid "a time relative to the current time"
 msgstr "en tid relativ til tiden nЕ"
 
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Velg en tid Е sammenligne mot"
-
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
@@ -8913,7 +8900,7 @@ msgstr "Sender melding %d av %d"
 msgid "Failed on message %d of %d"
 msgstr "Feilet pЕ melding %d av %d"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "FullfЬrt."
 
@@ -9094,7 +9081,7 @@ msgstr "Oppdaterer..."
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Avbrutt"
 
@@ -9306,7 +9293,7 @@ msgstr "%l:%M%p"
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
@@ -9315,7 +9302,7 @@ msgstr "E-post sammendrag"
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
 #: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:602
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
@@ -9352,8 +9339,9 @@ msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Feil under nedlasting av RDF</b>"
 
 #: my-evolution/e-summary-rdf.c:479
-msgid "RDF Summary"
-msgstr "RDF-sammendrag"
+#, fuzzy
+msgid "News Feed"
+msgstr "_Nyhetstjenester"
 
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
@@ -9371,7 +9359,7 @@ msgstr "<dd><b>VФr-tjeneren kunne ikke kontaktes</b></dd>"
 msgid "Weather"
 msgstr "VФr"
 
-#: my-evolution/e-summary-weather.c:663
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Regioner"
 
@@ -10709,7 +10697,7 @@ msgstr "Innboks"
 msgid "Outbox"
 msgstr "Utboks"
 
-#: shell/e-local-storage.c:592
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
@@ -10811,25 +10799,25 @@ msgstr "Kan ikke kopiere en mappe oppЕ seg selv."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan ikke flytte en mappe til en av sine egne undermapper."
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Spesifiser en mappe som mappen \"%s\" skal kopieres til:"
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Kopier mappe"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Spesifiser en mappe Е flytte mappen \"%s\" til:"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Flytt mappe"
 
-#: shell/e-shell-folder-commands.c:357
+#: shell/e-shell-folder-commands.c:358
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -10838,30 +10826,30 @@ msgstr ""
 "Kunne ikke slette mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Slett mappe '%s'"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Er du sikker pЕ at du vil fjerne mappen '%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:458
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Endre navn pЕ mappe '%s'"
 
-#: shell/e-shell-folder-commands.c:462 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Endre navn"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:470
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappenavn:"
@@ -10895,7 +10883,7 @@ msgstr ""
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:580 shell/e-shell-folder-title-bar.c:581
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
@@ -11072,7 +11060,7 @@ msgid "Work Online"
 msgstr "Arbeid \"online\""
 
 #: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Arbeid \"offline\""
 
@@ -11134,7 +11122,7 @@ msgstr "Kan ikke registrere i OAF"
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1650 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -11227,7 +11215,7 @@ msgstr "Endre navn pЕ valgt snarvei til:"
 msgid "Open the folder linked to this shortcut"
 msgstr "еpne mappen som er lenket til denne snarveien"
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "еpne i nytt vindu"
 
@@ -11255,46 +11243,51 @@ msgstr "Snarveier"
 msgid "(No name)"
 msgstr "(Uten navn)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Spesifisert mappetype er ikke gyldig"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plass til Е opprette mappen"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Spesifisert mappe ble ikke funnet"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke stЬttet"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke stЬttet for dette lageret"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:511
 msgid "The specified folder cannot be modified or removed"
 msgstr "Spesifisert mappe kan ikke endres eller fjernes"
 
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Kan ikke flytte en mappe til en av sine egne undermapper."
+
 #: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
@@ -11741,7 +11734,7 @@ msgstr "Lagre denne oppfЬringen til disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Fil"
 
@@ -12007,7 +12000,7 @@ msgstr "Meldingsliste med trЕder"
 msgid "_Expunge"
 msgstr "_TЬm"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:39
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "M_appe"
 
@@ -12358,12 +12351,12 @@ msgstr "Lukk dette vinduet"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:50
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vis"
 
@@ -12554,7 +12547,7 @@ msgstr "Svar-til felt"
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:42
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -12698,99 +12691,95 @@ msgstr "Importer et eksternt filformat"
 msgid "Move this folder to another place"
 msgstr "Flytt denne mappen til et annet sted"
 
-#: ui/evolution.xml.h:19
-msgid "Open a new Evolution window"
-msgstr "еpne et nytt Evolution vindu"
-
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "еpne i nytt _vindu"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "еpne denne mappen i et annet vindu"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "Bytt"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "SlЕ av/pЕ visning av mappelinjen"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "SlЕ av/pЕ visning av snarveilinjen"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "Skift til \"offline\" arbeidsmodus."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_GЕ til mappe..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:42
 msgid "_Import File..."
 msgstr "_Importer fil..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Snarvei"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "Ar_beid \"offline\""
 
@@ -13121,6 +13110,25 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "RDF Summary"
+#~ msgstr "RDF-sammendrag"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Er du sikker pЕ at du vil\n"
+#~ "slette denne kontakten?"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Klikk her for Е legge til en deltaker"
+
+#~ msgid "Select a time to compare against"
+#~ msgstr "Velg en tid Е sammenligne mot"
+
+#~ msgid "Open a new Evolution window"
+#~ msgstr "еpne et nytt Evolution vindu"
+
 #~ msgid "Show work week"
 #~ msgstr "Vis arbeidsuke"
 
diff --git a/po/pl.po b/po/pl.po
index 9169723365..0e4acce566 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,10 +6,11 @@
 # pomСc w jego rozwijaniu i pielЙgnowaniu, napisz do nas na adres:
 # translators@gnome.pl
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-08-17 13:24+0200\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2001-08-17 17:43+0200\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -21,287 +22,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-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "File As"
-msgstr "Zapisz jako"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Name"
-msgstr "Nazwa"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Family Name"
-msgstr "Nazwisko panieЯskie"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-msgid "Primary"
-msgstr "GЁСwny"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Prim"
-msgstr "GЁw"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Assistant"
-msgstr "Asystent"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-msgid "Business"
-msgstr "Praca"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Bus"
-msgstr "Prc"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-msgid "Callback"
-msgstr "Telefon kontaktowy"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Comp"
-msgstr "Frma"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-msgid "Home"
-msgstr "Dom"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Organization"
-msgstr "Organizacja"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Org"
-msgstr "Org"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-msgid "Mobile"
-msgstr "Przeno╤ny"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-msgid "Car"
-msgstr "SamochСd"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Business Fax"
-msgstr "Faks sЁu©bowy"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Bus Fax"
-msgstr "Faks sЁu©b"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Home Fax"
-msgstr "Faks w domu"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-msgid "Business 2"
-msgstr "Praca 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Bus 2"
-msgstr "Prc 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-msgid "Home 2"
-msgstr "Dom 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: mail/mail-config.glade.h:1
-msgid "Other"
-msgstr "Inne"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Other Fax"
-msgstr "Inny faks"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "TTY"
-msgstr "TTY"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Web Site"
-msgstr "Serwis WWW"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Url"
-msgstr "Url"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Department"
-msgstr "OddziaЁ"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Dep"
-msgstr "Oddz"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Office"
-msgstr "Biuro"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Off"
-msgstr "Bro"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Title"
-msgstr "TytuЁ"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Profession"
-msgstr "ZawСd"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Prof"
-msgstr "Zawd"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Manager"
-msgstr "Menad©er"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Man"
-msgstr "Mnd©"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Ass"
-msgstr "Asyst"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Nickname"
-msgstr "Przydomek"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Nick"
-msgstr "Przyd"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Spouse"
-msgstr "MaЁ©onek"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Note"
-msgstr "Notka"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid "Free-busy URL"
-msgstr "URL sygnalizuj╠cy zajЙto╤Ф"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "FBUrl"
-msgstr "UrlZaj"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Anniversary"
-msgstr "Rocznica"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Anniv"
-msgstr "Roczn"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-msgid "Birth Date"
-msgstr "Data urodzenia"
-
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: calendar/gui/e-calendar-table.etspec.h:1
-msgid "Categories"
-msgstr "Kategorie"
-
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -309,7 +38,7 @@ msgstr ""
 "\n"
 "Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -317,7 +46,7 @@ msgstr ""
 "\n"
 "  Przedrostek: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -325,7 +54,7 @@ msgstr ""
 "\n"
 "  ImiЙ:       "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -333,7 +62,7 @@ msgstr ""
 "\n"
 "  Dodatkowe:  "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -341,7 +70,7 @@ msgstr ""
 "\n"
 "  Rodzina:    "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -349,7 +78,7 @@ msgstr ""
 "\n"
 "  Przyrostek: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -357,7 +86,7 @@ msgstr ""
 "\n"
 "Data urodzenia: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -365,7 +94,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -373,13 +102,13 @@ msgstr ""
 "\n"
 "  Skrzynka pocztowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -387,7 +116,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -395,7 +124,7 @@ msgstr ""
 "\n"
 "  Miasto:      "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -403,7 +132,7 @@ msgstr ""
 "\n"
 "  Region:      "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -411,7 +140,7 @@ msgstr ""
 "\n"
 "  Kod pocztowy: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -419,13 +148,13 @@ msgstr ""
 "\n"
 "  Kraj:        "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -433,7 +162,7 @@ msgstr ""
 "\n"
 "Telefony:\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -441,7 +170,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -449,7 +178,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -457,13 +186,13 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -471,7 +200,7 @@ msgstr ""
 "\n"
 "Strefa czasowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -479,7 +208,7 @@ msgstr ""
 "\n"
 "PoЁo©enie geograficzne: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -487,7 +216,7 @@ msgstr ""
 "\n"
 "Stanowisko sЁu©bowe: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -495,7 +224,7 @@ msgstr ""
 "\n"
 "Organizacja: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -503,7 +232,7 @@ msgstr ""
 "\n"
 "  Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -511,7 +240,7 @@ msgstr ""
 "\n"
 "  Jednostka: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -519,7 +248,7 @@ msgstr ""
 "\n"
 "  Jednostka2: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -527,7 +256,7 @@ msgstr ""
 "\n"
 "  Jednostka3: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -535,7 +264,7 @@ msgstr ""
 "\n"
 "  Jednostka4: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -543,7 +272,7 @@ msgstr ""
 "\n"
 "Kategorie: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -561,7 +290,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -569,7 +298,7 @@ msgstr ""
 "\n"
 "Unikatowy napis: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -577,49 +306,49 @@ msgstr ""
 "\n"
 "Klucz publiczny: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Plik VCard z wieloma pozycjami"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "Plik VCard z pozycj╠ %s"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:1
-#: addressbook/backend/ebook/load-pine-addressbook.c:1
-#: addressbook/backend/ebook/test-client-list.c:1
-#: addressbook/backend/ebook/test-client.c:1
-#: addressbook/conduit/address-conduit.c:1
-#: addressbook/gui/component/addressbook-factory.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
+#: 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:1100
+#: addressbook/gui/component/addressbook-factory.c:48
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 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:662
+#: 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:663
+#: 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:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -627,50 +356,85 @@ msgstr ""
 msgid "A Bonobo control for an address popup."
 msgstr "Komponent Bonobo wyskakuj╠cego okna z adresem."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
 msgid "A Bonobo control for displaying an address."
 msgstr "Komponent Bonobo wy╤wietlaj╠cy adres."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "PrzykЁadowy komponent Bonobo wy╤wietlaj╠cy ksi╠©kЙ adresow╠."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "Komponent Bonobo wy╤wietlaj╠cy miniaturow╠ kartЙ ksi╠©ki adresowej Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Przegl╠darka miniaturowych kart ksi╠©ki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution obsЁuguj╠cy kontakty."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Generator komponentСw miniatorowych kart ksi╠©ki adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Generator komponentСw wy╤wietlaj╠cych adres z ksi╠©ki adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 "Generator komponentСw wy╤wietlaj╠cych wyskakuj╠ce okno z adresem z ksi╠©ki "
 "adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the 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 "Generator przykЁadowych komponentСw ksi╠©ki adresowej"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"BЁ╠d przy wczytywaniu informacji o filtrze:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Nowy Kontakt:"
+
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Nowy Kontakt:"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Lista _kontaktСw"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Lista _kontaktСw"
+
+#: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
 msgstr "Ustawienia ksi╠©ki adresowej"
 
@@ -678,64 +442,64 @@ msgstr "Ustawienia ksi╠©ki adresowej"
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "Account Name"
 msgstr "Nazwa konta"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:3
 msgid "Add Addressbook"
 msgstr "Dodanie ksi╠©ki adresowej"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:4
 msgid "Addressbook Sources"
 msgstr "╛rСdЁa ksi╠©ki adresowej"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
 msgstr "Podstawa"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/dialogs/task-editor.c:1
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
 msgid "Basic"
 msgstr "Proste"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:8
 msgid "De_lete"
 msgstr "_UsuЯ"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:9
 msgid "One"
 msgstr "Pojedyncze"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:10
 msgid "Search _base:"
 msgstr "_Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "Search s_cope: "
 msgstr "_Zakres wyszukiwania:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Server Name"
 msgstr "Nazwa serwera"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:13
 msgid "Sub"
 msgstr "PodrzЙdne"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "The information below is required in order to add an addressbook.  "
 msgstr "W celu dodania ksi╠©ki adresowej potrzebne s╠ poni©sze informacje."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "This information is not required for most ldap servers. "
 msgstr "W przypadku wiЙkszo╤ci serwerСw LDAP te informacje nie s╠ potrzebne."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
@@ -744,7 +508,7 @@ msgstr ""
 "wykorzystywanych w wyszukiwaniu. Aby uzystaФ wiЙcej informacji, skontaktuj "
 "siЙ z administratorem systemu."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:17
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
@@ -752,15 +516,15 @@ msgstr ""
 "To jest wЙzeЁ bazowy dla wszystkich wyszukiwaЯ na serwerze LDAP. Aby uzystaФ "
 "wiЙcej informacji, skontaktuj siЙ z administratorem systemu."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:18
 msgid "This is the name of the server where your addressbook is located."
 msgstr "To jest nazwa serwera, na ktСrym zlokalizowana jest ksi╠©ka adresowa."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:19
 msgid "This is the port that your ldap server uses."
 msgstr "To jest numer portu, wykorzystywanego przez serwer LDAP."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:20
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
@@ -768,64 +532,65 @@ msgstr ""
 "Ta nazwa bЙdzie wykorzystywana do identyfikacji konta. Jest ona przeznaczona "
 "tylko do wy╤wietlania."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "_Account name:"
 msgstr "Nazwa _konta:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1 mail/mail-config.glade.h:1
-#: my-evolution/my-evolution.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: mail/mail-config.glade.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:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:24
 msgid "_My server requires authentication"
 msgstr "_Serwer wymaga uwierzytelnienia"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:25
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:26
 msgid "_Server name:"
 msgstr "_Nazwa serwera:"
 
-#: addressbook/gui/component/addressbook-storage.c:1
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "Inne kontakty"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Podaj swСj adres email i hasЁa dostЙpu do %s"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:394
 msgid "LDAP Authentication"
 msgstr "Uwierzytelnianie LDAP"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:405
 msgid "Email Address:"
 msgstr "Adres e-mail:"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:418
 msgid "Password:"
 msgstr "HasЁo:"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Nie mo©na otworzyФ ksi╠©ki adresowej"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -834,7 +599,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:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -845,7 +610,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:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -853,37 +618,37 @@ 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/cal-search-bar.c:1
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Nazwa zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "E-mail zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
-#: calendar/gui/cal-search-bar.c:1
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategori╠ jest"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:1 widgets/misc/e-filter-bar.h:1
-#: widgets/misc/e-filter-bar.h:1
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1
-#: calendar/gui/cal-search-bar.c:1
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Dowolna kategoria"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "URI ktСre ma wy╤wietliФ przegl╠darka katalogСw"
 
@@ -892,55 +657,67 @@ msgstr "URI ktСre ma wy╤wietliФ przegl╠darka katalogСw"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:178
 msgid "(none)"
 msgstr "(brak)"
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "GЁСwny e-mail"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: 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:934
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 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:963
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Dodaj do kontaktСw"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:1006
 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!)"
 
@@ -948,35 +725,35 @@ 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:729
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 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:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 msgid "Unnamed Contact"
 msgstr "Kontakt bez nazwy"
 
-#: addressbook/gui/component/select-names/e-select-names.c:1
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr "Brak dostЙpu do lokalnego pojemnika. To siЙ nie powinno zdarzyФ."
 
-#: addressbook/gui/component/select-names/e-select-names.c:1
+#: addressbook/gui/component/select-names/e-select-names.c:560
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -984,31 +761,31 @@ msgstr ""
 msgid "C_ontaining:"
 msgstr "Z_awieraj╠cy:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Co_ntacts:"
 msgstr "_Kontakty:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "F_ind"
 msgstr "_Znajd╪:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Select Names"
 msgstr "WybСr nazw"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show contacts matching the following criteria:"
 msgstr "Wy╤wietlenie kontaktСw, odpowiadaj╠cych nastЙpuj╠cym kryteriom:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Folder:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Message Recipients:"
 msgstr "Odbiorcy _listu:"
 
@@ -1016,173 +793,255 @@ msgstr "Odbiorcy _listu:"
 msgid "Anni_versary:"
 msgstr "_Rocznica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "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:156
 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 A_s:"
 msgstr "Zapis pod n_azw╠:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 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:16
 msgid "_Address..."
 msgstr "_Adres..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "_Nazwisko asystenta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_Urodziny:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 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:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontakty..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.c:1 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:21
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_UsuЯ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_OddziaЁ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_PeЁna nazwa..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Dom"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 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:26
 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:27
 msgid "_Mobile"
 msgstr "P_rzeno╤ny"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Przydomek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Biuro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_ZawСd:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_MaЁ©onek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_To jest adres pocztowy"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Web page address:"
 msgstr "Adres strony _WWW:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Czy na pewno chcesz\n"
-"usun╠Ф ten kontakt?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Usun╠Ф kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Ten kontakt przynale©y do nastЙpuj╠cych kategorii:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
+msgid "Assistant"
+msgstr "Asystent"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+msgid "Business"
+msgstr "Praca"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+msgid "Business 2"
+msgstr "Praca 2"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
+msgid "Business Fax"
+msgstr "Faks sЁu©bowy"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
+msgid "Callback"
+msgstr "Telefon kontaktowy"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+msgid "Car"
+msgstr "SamochСd"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
+msgid "Company"
+msgstr "Firma"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
+msgid "Home"
+msgstr "Dom"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
+msgid "Home 2"
+msgstr "Dom 2"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
+msgid "Home Fax"
+msgstr "Faks w domu"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+msgid "Mobile"
+msgstr "Przeno╤ny"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
+msgid "Other"
+msgstr "Inne"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
+msgid "Other Fax"
+msgstr "Inny faks"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
+msgid "Primary"
+msgstr "GЁСwny"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTy/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Nie mo©na usun╠Ф pliku z zestawieniem folderu \"%s\": %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 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:267
 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:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 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:299
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:1
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -1195,43 +1054,1037 @@ msgstr ""
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Asystent"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Automatycznie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "UЁo©enie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "SierpieЯ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "lat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Rozmiar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+msgid "Benin"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Grad"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Przewodniczenie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Sprawd╪ adres"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "ChiЯski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "ChiЯski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Nowy list"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Kopiowanie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "_Kraj:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "USA"
-msgstr "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Anuluj"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "Grecki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "OgСlne"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Grad"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "Godzin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Niedziela"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+#, fuzzy
+msgid "Iceland"
+msgstr "Od╤wie©"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+#, fuzzy
+msgid "India"
+msgstr "Osoba"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#, fuzzy
+msgid "Ireland"
+msgstr "Od╤wie©"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+#, fuzzy
+msgid "Japan"
+msgstr "JapoЯski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#, fuzzy
+msgid "Jordan"
+msgstr "KoreaЯski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Najni©szy"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Najni©szy"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "_imperialne"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#, fuzzy
+msgid "Lithuania"
+msgstr "Lekki grad"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Marzec"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Poczta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Poczta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Poczta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#, fuzzy
+msgid "Marshall Islands"
+msgstr "SЁaba burza piaskowa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Marginesy"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Maj"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "PoniedziaЁek"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Przeno╤ny"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Menad©er"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Odpowiedz"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Kolejny w╠tek"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Nowy Kontakt:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Wy©szy"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "_imperialne"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minuta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Teraz"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Wklej"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papier"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#, fuzzy
+msgid "Pitcairn"
+msgstr "Wydrukuj kartЙ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Portret"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "po"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Regiony"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Dym"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "OgСlne"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "Pl_anowanie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "ZwykЁy"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Deszcz"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Niedziela"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Przydomek"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Widziany"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Deszcz"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "_Lista zadaЯ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Dla"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Tornado"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Wtorek"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Turecki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#, fuzzy
+msgid "Ukraine"
+msgstr "UkraiЯski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "List bez nazwy"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "WybСr nazw"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#, fuzzy
+msgid "Western Sahara"
+msgstr "Zachodnioeuropejski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Widziany"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Miasto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "Skrzynka p_ocztowa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Stan/Prowincja:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_Kod pocztowy:"
 
@@ -1239,67 +2092,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Ё:"
 
@@ -1307,29 +2160,29 @@ msgstr "_TytuЁ:"
 msgid "List _name:"
 msgstr "Nazwa _listy:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 msgid "Members"
 msgstr "CzЁonkowie"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Type an email address or drag a contact into the list below:"
 msgstr "Wprowad╪ adres e-mail lub przeci╠gnij kontakt do poni©szej listy:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ukrywanie adresСw przy wysyЁaniu do tej listy"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "_UsuЯ"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "contact-list-editor"
 msgstr "Edytor listy kontaktСw"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:1
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 msgid "Contact List Editor"
 msgstr "Edytor listy kontaktСw"
 
@@ -1337,20 +2190,20 @@ msgstr "Edytor listy kontaktСw"
 msgid "Add Anyway"
 msgstr "Dodaj mimo tego"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr "Wykryto powtСrzony kontakt"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 msgid "New Contact:"
 msgstr "Nowy Kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 msgid "Original Contact:"
 msgstr "Oryginalny kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -1362,15 +2215,15 @@ msgstr ""
 msgid "Change Anyway"
 msgstr "ZmieЯ mimo tego"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Zmieniony kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "Koliduj╠cy kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1378,13 +2231,13 @@ msgstr ""
 "Folder zawiera ju© kontakt o tej samej nazwie lub adresie e-mail.\n"
 "Czy pomimo tego chcesz go dodaФ?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:1
-#: widgets/misc/e-filter-bar.c:1
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:243
 msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:1
-#: mail/mail-search.c:1
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Wyszukiwanie"
 
@@ -1392,318 +2245,357 @@ 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-view.c:1
-#: ui/evolution-addressbook.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Zapisz jako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: shell/e-shortcuts-view.c:1 ui/evolution-message-composer.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "OtwСrz"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1
-msgid "Send contact to other"
-msgstr "Wy╤lij kontakt do innej osoby"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Prze╤lij _zaЁ╠czony"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "Wy╤lij list do kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1 ui/my-evolution.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
+#: ui/my-evolution.xml.h:2
 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:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 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-accounts.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 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-shell.c:1
-#: shell/e-storage.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 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 "Repozytorium rozЁ╠czone"
 
-#: 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:505
 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
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 camel/camel-service.c:1
-#: camel/camel-service.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
 msgid "Cancelled"
 msgstr "Anulowane"
 
-#: 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:1218
 msgid "Error removing card"
 msgstr "BЁ╠d przy usuwaniu karty"
 
-#. Translators: put here a list of labels you want to see on buttons in
-#. addressbook. You may use any character to separate labels but it must
-#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ""
-",123,a,╠,b,c,Ф,d,e,Й,f,g,h,i,j,k,l,Ё,m,n,Я,o,С,p,q,r,s,╤,t,u,v,w,x,y,z,╪,©"
-
-#. Translators: put here a list of characters that correspond to buttons
-#. in addressbook. You may use any character to separate labels but it
-#. must also be placed at the begining ot the string.
-#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ""
-",0,a,╠,b,c,Ф,d,e,Й,f,g,h,i,j,k,l,Ё,m,n,Я,o,С,p,q,r,s,╤,t,u,v,w,x,y,z,╪,©"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Kliknij, aby dodaФ kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:834
+msgid "File As"
+msgstr "Zapisz jako"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:836
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "GЁСwny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Telefon asystenta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Telefon sЁu©bowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "Telefon callbacka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Telefon firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Telefon domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:843
+msgid "Organization"
+msgstr "Organizacja"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Adres firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Adres domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Telefon przeno╤ny"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Telefon samochodowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Telefon sЁu©bowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Telefon domowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Inny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:858
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Inny adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:862
+msgid "Web Site"
+msgstr "Serwis WWW"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:863
+msgid "Department"
+msgstr "OddziaЁ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:864
+msgid "Office"
+msgstr "Biuro"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:865
+msgid "Title"
+msgstr "TytuЁ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:866
+msgid "Profession"
+msgstr "ZawСd"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:867
+msgid "Manager"
+msgstr "Menad©er"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:869
+msgid "Nickname"
+msgstr "Przydomek"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "Spouse"
+msgstr "MaЁ©onek"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:871
+msgid "Note"
+msgstr "Notka"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:872
+msgid "Free-busy URL"
+msgstr "URL sygnalizuj╠cy zajЙto╤Ф"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "Gotowe."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 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"
@@ -1717,7 +2609,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"
 
@@ -1725,196 +2617,196 @@ msgstr "Widok karty"
 msgid "10 pt. Tahoma"
 msgstr "10-punktowa Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8-punktowa Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Pustych formatek na koЯcu:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Tre╤Ф"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Dolny:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Wymiary:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
 msgstr "_Czcionka..."
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Stopka:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "GЁСwka"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "GЁСwka/Stopka"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "NagЁСwki"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "NagЁСwek dla ka©dej litery"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Wysoko╤Ф:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Bezpo╤rednio jedna po drugiej"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "DoЁ╠czanie:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Pejza©"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Lewy:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "ZakЁadki liter z boku"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marginesy"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Opcje"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
 msgstr "UЁo©enie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Strona"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Ustawienia strony:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Papier"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "╛rСdЁo papieru:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Portret"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Podgl╠d:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Drukowanie przy u©yciu odcieni szaro╤ci"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Odwrotnie na stronach parzystych"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Prawy:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Sekcje:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Cieniowanie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Rozpoczynana na nowej stronie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Nazwa stylu:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "GСrny:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Typ:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Szeroko╤Ф:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "_Czcionka..."
 
-#: addressbook/printing/e-contact-print.c:1
+#: addressbook/printing/e-contact-print.c:1091
 msgid "Print cards"
 msgstr "Wydrukuj karty"
 
-#: addressbook/printing/e-contact-print.c:1
-#: addressbook/printing/e-contact-print.c:1
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
 msgid "Print card"
 msgstr "Wydrukuj kartЙ"
 
-#: addressbook/printing/e-contact-print-envelope.c:1
-#: addressbook/printing/e-contact-print-envelope.c:1
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Wydrukuj kopertЙ"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: 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 ""
 
@@ -1922,35 +2814,35 @@ 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 "Komponent zestawienia wykonawczego kalendarza Evolution."
 
-#: 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:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
@@ -1958,49 +2850,49 @@ msgstr ""
 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"
 
@@ -2009,39 +2901,39 @@ 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 "_U╤pij"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr "Czas u╤pienia (minuty)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "_Edit appointment"
 msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c: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 "U╤pij"
 
 #. 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 "
@@ -2049,149 +2941,149 @@ msgid ""
 msgstr ""
 "Jest teraz %s.  WedЁug czasu uniksowego - %ld. Mo©e chciaЁby╤ wiedzieФ."
 
-#: 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:72
 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
+#: calendar/gui/calendar-commands.c:414
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:1 calendar/gui/e-day-view-top-item.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view-main-item.c:1
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:1 calendar/gui/calendar-commands.c:1
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:435
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: calendar/gui/calendar-commands.c:1 calendar/gui/calendar-commands.c:1
-#: calendar/gui/calendar-commands.c:1 calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:1
-#: calendar/gui/e-week-view-main-item.c:1 calendar/gui/print.c:1
-#: my-evolution/e-summary-calendar.c:1
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:604
 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:355 calendar/gui/calendar-model.c:925
+#: calendar/gui/e-calendar-table.c:307
 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:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
 msgid "Public"
 msgstr "Publiczny"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 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-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "ZwykЁy"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
 msgid "Free"
 msgstr "Wolny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-calendar-table.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "ZajЙty"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Przed rozpoczЙciem"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "Trwaj╠ce"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "ZakoЯczone"
 
 #. 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:839 e-util/e-time-utils.c:317
 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:842 e-util/e-time-utils.c:326
 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:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2202,7 +3094,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2212,108 +3104,146 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1051
 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:1092
 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-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/e-timezone-dialog.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1
-#: mail/mail-accounts.c:1 mail/mail-accounts.c:1
-#: mail/mail-config.glade.h:1 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/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Powtarzanie"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "Przyporz╠dkowany"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Tak"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 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/cal-search-bar.c:1
+#: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
 msgstr "Zestawienie zawiera"
 
-#: calendar/gui/cal-search-bar.c:1
+#: calendar/gui/cal-search-bar.c:57
 msgid "Description contains"
 msgstr "Opis zawiera"
 
-#: calendar/gui/cal-search-bar.c:1
+#: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "Komentarz zawiera"
 
-#: calendar/gui/cal-search-bar.c:1
+#: calendar/gui/cal-search-bar.c:416
 msgid "Unmatched"
 msgstr "Bez dopasowania"
 
-#: calendar/gui/control-factory.c:1
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Kalendarz"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Zadania"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "VFolder w oparciu o listЙ dyskusyjn╠"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Tworzy nowy termin"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr "Nowy _termin"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Tworzy nowe zadanie"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Nowe zadanie"
+
+#: 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:357
 msgid "Audio Alarm Options"
 msgstr "Ustawienia alarmu d╪wiЙkowego"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr "Ustawienia alarmu z komunikatem"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr "Ustawienia alarmu z wysЁaniem listu"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr "Ustawienia alarmu z uruchomieniem programu"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr "Ustawienia nieznanego alarmu"
 
@@ -2321,188 +3251,188 @@ 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:332
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 dzieЯ"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d tygodni"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 tydzieЯ"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d godzin"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 godzina"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:354
 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:379
+#: 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:383
+#: 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:387
+#: 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:391
+#: 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:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-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/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:409
 msgid "before start of appointment"
 msgstr "przed pocz╠tkiem terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:412
 msgid "after start of appointment"
 msgstr "po pocz╠tku terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:422
 msgid "before end of appointment"
 msgstr "przed koЯcem terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:425
 msgid "after end of appointment"
 msgstr "po koЯcu terminu"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr "Proste"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Date/Time:"
 msgstr "Data/Czas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: 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..."
 
-#: 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:34
 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:35
 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:115
 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"
 
@@ -2510,314 +3440,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 "15 minutes"
 msgstr "15 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "Calendar and Tasks Settings"
 msgstr "Ustawienia kalendarza i zadaЯ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
 msgstr "Kolor zalegЁych zadaЯ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for tasks due today"
 msgstr "Kolor dzisiejszych zadaЯ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Create new appointments with a default _reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "First day of wee_k:"
 msgstr "Pierwszy dzieЯ _tygodnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Pi╠tek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Godzin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "PoniedziaЁek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "_ZalegЁe zadania:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: 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:18
 msgid "Show appointment _end times in week and month views"
 msgstr ""
 "Wy╤wietlanie czasСw _zakoЯczenia terminСw w widoku tygodniowym i miesiЙcznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Wy╤wietlanie _numerСw tygodni w przegl╠darce dat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Sta_rt of day:"
 msgstr "_Pocz╠tek dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Su_n"
 msgstr "_Nie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "_Czw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "T_ue"
 msgstr "_Wto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Tas_ks due today:"
 msgstr "_Zadania na dzi╤:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr "Czas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time _zone:"
 msgstr "_Strefa czasowa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Time di_visions:"
 msgstr "Prze_dziaЁy czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "╕roda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ui/evolution-calendar.xml.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "TydzieЯ roboczy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_12 hour (AM/PM)"
 msgstr "_12-godzinny (AP/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
 msgstr "_24-godzinny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Potwierdzanie przed usuniЙciem elementСw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Compress weekends in month view"
 msgstr "_Kompresowanie weekendСw na widoku miesiЙcznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Wy╤wietlanie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_End of day:"
 msgstr "_Koniec dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
 msgstr "_Pi╠"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_General"
 msgstr "_OgСlne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Ukrycie _usuniЙtych listСw"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
 msgstr "P_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Other"
 msgstr "_Inne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "_Overdue tasks:"
-msgstr "_ZalegЁe zadania:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
 msgstr "_Sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Task List"
 msgstr "_Lista zadaЯ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Wed"
 msgstr "╕_ro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "before the start of the appointment"
 msgstr "przed pocz╠tkiem terminu"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c: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 "Zdarzenie 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 "%s  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 "%s  Wprowadzono zmiany. AnulowaФ je wszystkie i uaktualniФ edytor?"
 
-#: 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 "%s Nie wprowadzono ©adnych zmian, uaktualniФ edytor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (ZakoЯczone "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "ZakoЯczone"
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Nale©ne "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Nale©ne "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/dialogs/comp-editor-util.c:1 shell/e-local-storage.c:1
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:487
 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:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 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:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2825,53 +3756,53 @@ msgstr ""
 "Plik o tej nazwie ju© istnieje.\n"
 "NadpisaФ go?"
 
-#: calendar/gui/dialogs/comp-editor.c:1 ui/evolution-comp-editor.xml.h:1
-#: widgets/misc/e-filter-bar.h:1
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
+#: 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:1077
 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"
@@ -2880,50 +3811,28 @@ msgstr "Czy na pewno chcesz usun╠Ф %d wpisСw dziennika"
 msgid "Addressbook..."
 msgstr "Ksi╠©ka adresowa..."
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr "Oddelegowanie do:"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr "WybСr strefy czasowej"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Selection:"
-msgstr "WybСr:"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Time Zones"
-msgstr "Strefy czasowe"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-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 ""
-"Za pomoc╠ lewego przycisku myszy mo©esz powiЙkszyФ fragment mapy i wybraФ "
-"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:156
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Powtarzalno╤Ф"
 
-#: calendar/gui/dialogs/event-editor.c:1
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr "Spotkanie"
 
@@ -2931,174 +3840,174 @@ msgstr "Spotkanie"
 msgid "A_ll day event"
 msgstr "Wydarzenie _caЁodniowe"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "B_usy"
 msgstr "_ZajЙty"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klasyfikacja"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Con_fidential"
 msgstr "_Tajny"
 
-#: 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:3
 msgid "Date & Time"
 msgstr "Data i czas"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:7
 msgid "F_ree"
 msgstr "_Wolny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "P_rywatny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Pu_bliczny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Okres czasu wy╤wietlany jako"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "Z_estawienie:"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "Czas _zakoЯczenia"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "Czas _rozpoczЙcia:"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr "Osoba"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 msgid "Resource"
 msgstr "ZasСb"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr "Pomieszczenie"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 msgid "Chair"
 msgstr "Przewodniczenie"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "Wymagany uczestnik"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Opcjonalny uczestnik"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "Nie uczestnik"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 msgid "Needs Action"
 msgstr "Wymaga dziaЁania"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr "Zaakceptowane"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 msgid "Declined"
 msgstr "Odrzucone"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "PrСbnie zaakceptowane"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 msgid "Delegated"
 msgstr "Oddelegowane"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "In Process"
 msgstr "W trakcie"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr "Ta osoba ju© uczestniczy w spotkaniu!"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Chair Persons"
 msgstr "Osoby przewodnicz╠ce"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr "Wymagani uczestnicy"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Optional Participants"
 msgstr "Opcjonalni uczestnicy"
 
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr "Nie uczestnicy"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:920
 msgid "Sent By:"
 msgstr "WysЁane przez:"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:1471
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
@@ -3106,94 +4015,90 @@ msgstr "_Oddeleguj do..."
 msgid "Attendee"
 msgstr "Uczestnik"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-msgid "Click here to add an attendee"
-msgstr "Kliknij, aby dodaФ uczestnika"
-
-#: 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:14 filter/libfilter-i18n.h:31
+#: 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:85
+#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "_Change Organizer"
 msgstr "_ZmieЯ organizatora"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/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 "w"
 
-#: 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:1275
 msgid "occurrences"
 msgstr "powtСrzeniami"
 
@@ -3201,578 +4106,583 @@ msgstr "powtСrzeniami"
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Co"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Wyj╠tki"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Preview"
 msgstr "Podgl╠d"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "ReguЁa powtarzalno╤ci"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "_Custom recurrence"
 msgstr "_Dowolna powtarzalno╤Ф"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "_ZmieЯ"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "_No recurrence"
 msgstr "_Brak powtarzalno╤ci"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Simple recurrence"
 msgstr "_Prosta powtarzalno╤Ф"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "z"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "forever"
 msgstr "bez koЯca"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
 msgid "month(s)"
 msgstr "miesiЙcy"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "a© do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "tygodni"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "lat"
 
-#: calendar/gui/dialogs/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/e-calendar-table.etspec.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% zakoЯczenia"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:5
 msgid "Date Completed:"
 msgstr "Data zakoЯczenia:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "PostЙp"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: my-evolution/e-summary-preferences.c:1
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Priorytet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Stan:"
 
-#: calendar/gui/dialogs/task-editor.c:1
-#: calendar/gui/dialogs/task-editor.c:1
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
 msgid "Assignment"
 msgstr "Przyporz╠dkowanie"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-itip-control.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Czas _rozpoczЙcia:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Confidential"
 msgstr "_Tajny"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Czas _zakoЯczenia:"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 mail/folder-browser.c:1
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "_OtwСrz"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Wytnij"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "S_kopiuj"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: calendar/gui/e-week-view.c:1 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:863
 msgid "_Mark as Complete"
 msgstr "_Oznacz jako zakoЯczone"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:865
 msgid "_Delete this Task"
 msgstr "_UsuЯ zadanie"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr "_Oznacz zadania jako zakoЯczone"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:870
 msgid "_Delete Selected Tasks"
 msgstr "_UsuЯ zaznaczone zadania"
 
-#: calendar/gui/e-calendar-table.c:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.c:1130
 msgid "Click to add a task"
 msgstr "Kliknij, aby dodaФ zadanie"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:1 camel/camel-filter-driver.c:1
-#: camel/camel-filter-driver.c:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorie"
+
+#: 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:13
 msgid "Start Date"
 msgstr "Data rozpoczЙcia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1 shell/e-storage-set-view.c:1
-#: shell/e-summary-storage.c:1
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Zestawienie"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Porz╠dek zadaЯ"
 
-#: 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 "%02i-minutowe przedziaЁy czasu"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1 calendar/gui/print.c:1
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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:1381
+#: 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:588 calendar/gui/e-week-view.c:324
+#: 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:591 calendar/gui/e-week-view.c:327
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:1
-msgid "New _Appointment"
-msgstr "Nowy _termin"
-
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr "Nowe _zdarzenie caЁodniowe"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Przejd╪ do d_zisiaj"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 msgid "_Go to Date..."
 msgstr "_Przejd╪ do daty..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 msgid "_Delete this Appointment"
 msgstr "_UsuЯ termin"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 msgid "Make this Occurrence _Movable"
 msgstr "PrzeksztaЁФ to wyst╠pienie w p_rzesuwalne"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 msgid "Delete this _Occurrence"
 msgstr "UsuЯ to _wyst╠pienie"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 msgid "Delete _All Occurrences"
 msgstr "UsuЯ w_szystkie wyst╠pienia"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:617
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> opublikowaЁ informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:618
 msgid "Meeting Information"
 msgstr "Informacje o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:622
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:623
 msgid "Meeting Proposal"
 msgstr "Propozycja spotkania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:627
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:628
 msgid "Meeting Update"
 msgstr "Aktualizacja spotkania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:632
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> chce otrzymaФ naj╤wie©sze informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:633
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:637
 #, fuzzy, c-format
 msgid "<b>%s</b> has replyed to a meeting request."
 msgstr "To jest odpowied╪ na pro╤bЙ o spotkanie."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Spotkanie"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> anulowaЁ spotkanie."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:643
 msgid "Meeting Cancellation"
 msgstr "Anulowanie spotkania"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Wyszukiwanie w li╤cie"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:665
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> opublikowaЁ informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:666
 msgid "Task Information"
 msgstr "Informacje o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:670
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:671
 msgid "Task Proposal"
 msgstr "Propozycja zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:675
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:676
 msgid "Task Update"
 msgstr "Aktualizacja zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:680
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> chce otrzymaФ  naj╤wie©sze informacje o zadaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:681
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:685
 #, c-format
 msgid "<b>%s</b> has replyed to a task assignment."
 msgstr "<b>%s</b> odpowiedziaЁ na przypisanie zadania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:686
 msgid "Task Reply"
 msgstr "Odpowied╪ na zadanie"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:690
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> anulowaЁ zadanie."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:691
 msgid "Task Cancellation"
 msgstr "Anulowanie zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Komunikat kalendarza"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:713
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> opublikowaЁ informacjЙ o zajЙto╤ci."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:714
 msgid "Free/Busy Information"
 msgstr "Informacja o zajЙto╤ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:718
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "To jest pro╤ba o informacjЙ o zajЙto╤ci."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:719
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL sygnalizuj╠cy zajЙto╤Ф"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:723
 #, fuzzy, c-format
 msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr "To jest odpowied╪ na pro╤bЙ o informacjЙ o zajЙto╤ci."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:724
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL sygnalizuj╠cy zajЙto╤Ф"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:729
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Poprzedni list"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:940
 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:942
 msgid "Update complete\n"
 msgstr "Aktualizacja zakoЯczona\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nie mo©na usun╠Ф elementu z pliku kalendarza!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:969
 msgid "Removal Complete"
 msgstr "UsuniЙcie zakoЯczone"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
 msgid "Item sent!\n"
 msgstr "Element zostaЁ wysЁany!\n"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-msgid "The item could not be send!\n"
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+#, fuzzy
+msgid "The item could not be sent!\n"
 msgstr "Nie mo©na wysЁaФ elementu!\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:349
 #, 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:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda wymagana do odczytu \"%s\" nie jest obsЁugiwana"
 
-#: calendar/gui/e-week-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1260
 #, 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:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda wymagana do otwarcia \"%s\" nie jest obsЁugiwana"
@@ -3781,272 +4691,265 @@ 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 "Go To Today"
 msgstr "Przejd╪ do dzi╤"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "StyczeЯ"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Lipiec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Czerwiec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Marzec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Maj"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Listopad"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Pa╪dziernik"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "WrzesieЯ"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:253
 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-local-storage.c:1
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Zadania"
-
 #. Day
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Wybrany dzieЯ dzieЯ (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
+#: calendar/gui/print.c: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
+#: calendar/gui/print.c:1846
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Wybrany tydzieЯ (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1854
 msgid "Selected month (%b %Y)"
 msgstr "Wybrany miesi╠c (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1861
 msgid "Selected year (%Y)"
 msgstr "Wybrany 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-comp-editor.xml.h:1
-#: ui/evolution-mail-message.xml.h:1
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 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:127
 msgid "The URI of the tasks folder to display"
 msgstr "URI folderu 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."
@@ -4054,7 +4957,7 @@ msgstr ""
 "Zadania umieszczone w folderze kalendarza zostaЁy przez Evolution "
 "automatycznie przeniesione do nowego folderu zadaЯ."
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:109
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -4066,7 +4969,7 @@ msgstr ""
 "NiektСre z zadaЯ nie mogЁy zostaФ przeniesione, wiЙc proces mo©e siЙ w "
 "przyszЁo╤ci powtСrzyФ."
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:121
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -4075,7 +4978,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 "
@@ -4084,104 +4987,104 @@ msgstr ""
 "Metoda wymagana do odczytu \"%s\" nie jest obsЁugiwana. Nie przeniesiono "
 "©adnych elementСw z folderu kalendarza do folderu zadaЯ."
 
-#: calendar/gui/weekday-picker.c:1 calendar/gui/weekday-picker.c:1
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "NPW╕CPS"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:218
 msgid "time-now expects 0 arguments"
 msgstr "time-now wymaga 0 argumentСw"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:242
 msgid "make-time expects 1 argument"
 msgstr "time-now wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:247
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time wymaga, ©eby 1. argument byЁ napisem"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:255
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "make-time wymaga, aby 1. argument byЁ napisem z dat╠/czasem w formacie ISO "
 "8601"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:284
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day wymaga 2 argumentСw"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:289
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 "time-add-day wymaga, aby 1. argument byЁ liczb╠ okre╤laj╠c╠ czas (time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:296
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day wymaga, aby 2. argument byЁ liczb╠ caЁkowit╠"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:323
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:328
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 "time-day-begin wymaga, aby 1. argument byЁ liczb╠ okre╤laj╠c╠ czas (time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:355
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:360
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 "time-day-end wymaga, aby 1. argument byЁ liczb╠ okre╤laj╠c╠ czas (time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:396
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype wymaga 0 argumentСw"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:492
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? wymaga 2 argumentСw"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:497
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 "occur-in-time-range? wymaga, aby 1. argument byЁ liczb╠ okre╤laj╠c╠ czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:504
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 "occur-in-time-range? wymaga, aby 2. argument byЁ liczb╠ okre╤laj╠c╠ czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:634
 msgid "contains? expects 2 arguments"
 msgstr "contains? wymaga 2 argumentСw"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:639
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? wymaga, ©eby 1. argument byЁ napisem"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:646
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? wymaga, ©eby 2. argument byЁ napisem"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:663
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
-"contains? wymaga, ©eby 1. argument miaЁ jedn╠ z warto╤ci: \"any\", "
-"\"summary\", \"description\""
+"contains? wymaga, ©eby 1. argument miaЁ jedn╠ z warto╤ci: \"any\", \"summary"
+"\", \"description\""
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:705
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? wymaga co najmniej 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:717
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -4189,31 +5092,36 @@ msgstr ""
 "has-categories? wymaga, ©eby wszystkie argumenty byЁy napisami, lub ©eby "
 "podany byЁ dokЁadnie jeden argument, bЙd╠cy faЁszem logicznym (#f)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:805
+#, fuzzy
+msgid "is-completed? expects 0 arguments"
+msgstr "time-now wymaga 0 argumentСw"
+
+#: calendar/pcs/query.c:1008
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Przetworzenie wyra©enia wyszukiwania nie daЁo warto╤ci logicznej"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obsЁuguje podpisywania"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: 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"
@@ -4224,7 +5132,7 @@ msgstr ""
 "Kolejne operacje na tym serwerze nie b╠d╠ mogЁy zostaФ odtworzone\n"
 "po ponownym podЁ╠czeniu do sieci."
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:244
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -4235,70 +5143,70 @@ 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
+#: camel/camel-filter-driver.c:667
 #, c-format
 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:468 camel/camel-filter-search.c:475
 #, 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"
@@ -4307,7 +5215,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"
@@ -4316,257 +5224,257 @@ 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 "(match-all) wymaga pojedynczego wyniku logicznego"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:563
 #, 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:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Niepoprawny typ warto╤ci body-contains, oczekiwano napisu"
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c: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
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Wprowad╪ swoje dЁugie hasЁo %s dla %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Wprowad╪ swoje dЁugie hasЁo %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c: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:1080 camel/camel-pgp-context.c:1295
 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:1087
+#: camel/camel-pgp-context.c:1302
 #, 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:1070
 msgid "No plaintext to encrypt."
 msgstr "Brak tekstu do zaszyfrowania."
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Nie podano odbiorcСw"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1287
 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:272
 #, 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:386
 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
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
 
-#: 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."
@@ -4574,11 +5482,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."
@@ -4586,41 +5494,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"
@@ -4629,108 +5537,108 @@ msgstr ""
 "Nie mo©na pobraФ biletu Kerberosa:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:1
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c: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-sasl-plain.c:1 camel/providers/imap/camel-imap-provider.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/pop3/camel-pop3-provider.c:1 mail/mail-config.glade.h:1
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "HasЁo"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr "POP przed SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 "Ta opcja spowoduje uwierzytelnienie poЁ╠czenia POP przed wykorzystaniem SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr "URI ╪rСdЁa POP"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "Uwierzytelnianie POP przed SMTP z u©yciem nieznanego transportu"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: 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:155
 #, 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:163
 #, 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:171
 #, 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:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "Wyszukiwanie: %s"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:576
 #, 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:601
 #, 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:603
 #, 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 "Do odczytu poczty jako zapytania na innym zbiorze folderСw"
 
-#: camel/camel-session.c:1 camel/camel-session.c:1
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, 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:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4739,44 +5647,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."
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4784,7 +5692,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:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4799,7 +5707,7 @@ msgstr ""
 "\n"
 "Czy pomimo tego chcesz go zaakceptowaФ?"
 
-#: camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -4811,156 +5719,156 @@ 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:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied╪ od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nie powiodЁo siЙ polecenie IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "Odpowied╪ serwera zakoЯczyЁa siЙ zbyt wcze╤nie."
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpowied╪ serwera IMAP nie zawiera informacji %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied╪ OK od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:190
 #, 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:209
 #, 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:273
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder na serwerze zostaЁ usuniЙty stworzony ponownie."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:435
 msgid "Scanning for changed messages"
 msgstr "Wyszukiwanie zmodyfikowanych listСw"
 
-#: camel/providers/imap/camel-imap-folder.c:1
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:1491
+#: 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:1
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr "Pobieranie informacji podsumowuj╠cych nowe listy"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:1640
 msgid "Scanning for new messages"
 msgstr "Wyszukiwanie nowych listСw"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c: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:14
 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:720
 msgid "Folders"
 msgstr "Foldery"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Show only subscribed folders"
 msgstr "Wy╤wietlanie tylko zasubskrybowanych folderСw"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Override server-supplied folder namespace"
 msgstr "Nadpisanie przestrzeni nazw podanej przez serwer"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:54
 msgid "Namespace"
 msgstr "PrzestrzeЯ nazw"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Zastosowywanie filtrСw w odniesieniu do nowych listСw w INBOX na tym serwerze"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "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:388
 #, 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 "%sPodaj hasЁo IMAP dla %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:432
 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"
@@ -4971,107 +5879,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:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder nadrzЙdny nie mo©e zawieraФ folderСw podrzЙdnych"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c: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
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: 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:328
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -5080,20 +5988,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:328
+#: 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"
@@ -5102,16 +6010,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"
@@ -5120,56 +6028,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:209
+#: 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:265
 #, 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:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -5178,17 +6086,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:377
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Folder jest uszkodzony w sposСb uniemo©liwiaj╠cy naprawЙ."
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:390
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Stworzenie listu nie powiodЁo siЙ: Uszkodzona skrzynka?"
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -5197,7 +6105,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"
@@ -5206,14 +6114,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"
@@ -5222,175 +6130,176 @@ 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 "Summarizing 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: summarizing 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 "Powa©ny bЁ╠d skЁadniowy na pozycji %ld w folderze %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:371
 #, c-format
 msgid "Cannot summarize 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
-msgid "Synchronising folder"
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
 #, c-format
 msgid "Could not open folder to summarize: %s: %s"
 msgstr "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 "BЁ╠d przy zapisie do tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c: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:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nie mo©na stworzyФ zestawienia folderu: %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: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-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"
@@ -5399,63 +6308,63 @@ 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 "Nowiny USENET"
 
-#: 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 ""
 "To jest dostawca pozwalaj╠cy na odczyt i wysyЁanie na grupy nowin USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Nie mo©na otworzyФ katalogu serwera nowin: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nowiny USENET za po╤rednictwem %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -5463,63 +6372,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:189
 msgid "Retrieving POP summary"
 msgstr "Pobieranie zestawienia POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, 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:235
 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:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nie mo©na pobraФ listu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nie mo©na pobraФ listu z serwera POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Brak listu o warto╤ci uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Pobieranie listu %d z serwera POP"
 
-#: 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:53
 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."
@@ -5528,7 +6437,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."
@@ -5537,7 +6446,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 "
@@ -5547,34 +6456,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"
@@ -5583,12 +6492,12 @@ msgstr ""
 "Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem POP.\n"
 "Wyst╠piЁ bЁ╠d przy wysyЁaniu nazwy u©ytkownika: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c: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."
@@ -5596,7 +6505,7 @@ msgstr ""
 "Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem POP.\n"
 "Brak obsЁugi wymaganego mechanizmu uwierzytelniania."
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -5605,17 +6514,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:72
 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."
@@ -5623,174 +6532,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:65
 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:171
 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:173
 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:175
 msgid "Command not implemented"
 msgstr "Niezaimplementowane polecenie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "Niezaimplementowany parametr polecenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Komunikat pomocy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "UsЁuga gotowa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:185
 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:187
 msgid "Service not available, closing transmission channel"
 msgstr "UsЁuga nie jest dostЙpna, zamykanie kanaЁu transmisyjnego"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "Pomy╤lnie wykonano ©╠dan╠ operacjЙ na li╤cie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr "U©ytkownik nie jest lokalny; przesЁanie do <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Nie wykonano ©╠danej operacji na li╤cie: skrzynka jest niedostЙpna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Nie wykonano ©╠danej operacji: skrzynka jest niedostЙpna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "Przerwano ©╠dan╠ czynno╤Ф: bЁ╠d przy przetwarzaniu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "U©ytkownik nie jest lokalny; sprСbuj <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Nie wykonano ©╠danej operacji: brak miejsca w systemie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Przerwano ©╠dan╠ czynno╤Ф: przekroczony wykorzystany rozmiar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Nie wykonano ©╠danej operacji: niedozwolona nazwa skrzynki"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Rozpocznij wprowadzanie listu; zakoЯcz poprzez <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Transakcja nie powiodЁa siЙ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:213
 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:215
 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:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr "╞╠dany miechanizm uwierzytelniaj╠cy wymaga szyfrowania"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Chwilowe niepowodzenie przy uwierzytelnianiu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, 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:378
 #, 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:417
 #, 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:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5801,169 +6710,169 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, 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:558
 #, 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:583
 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:590
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie mo©na wysЁaФ listu: niepoprawny adres nadawcy."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1 mail/mail-ops.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "WysyЁanie listu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:606
 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:686
 msgid "SMTP Greeting"
 msgstr "Powitanie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:728
 #, 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:760
 msgid "SMTP Authentication"
 msgstr "Uwierzytelnianie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:766
 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:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, 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:802
 msgid "AUTH request failed."
 msgstr "Nie powiodЁo siЙ wykonanie AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "Niepoprawna odpowied╪ serwera na uwierzytelnienie.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:895
 #, 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:920
 #, 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:939
 #, 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:970
 #, 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:989
 #, 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:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1043
 #, 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:1067
 #, 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:1086
 #, 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:1109
 #, 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:1128
 #, 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:133
 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"
 
@@ -5971,77 +6880,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:327
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzyФ ksi╠©kЙ adresow╠"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Odpowied╪ do:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Podaj adresy, pod ktСre zostanie przesЁana kopia listu"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 "Podaj adresy, pod ktСre zostanie przesЁana kopia listu bez listy odbiorcСw."
 
-#: composer/e-msg-composer-select-file.c:1
-#: ui/evolution-message-composer.xml.h:1
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "ZaЁ╠czenie pliku"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -6050,7 +6959,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"
@@ -6059,29 +6968,29 @@ msgstr ""
 "BЁ╠d przy odczycie pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr "Ostrze©enie!"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "Plik istnieje, nadpisaФ?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:900
 #, 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:919
 #, 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:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -6089,16 +6998,16 @@ msgstr ""
 "Nie mo©na otworzyФ folderu poczty roboczej, zwi╠zanego z tym kontem.\n"
 "Czy chcesz zamiast tego wykorzystaФ domy╤lny folder Poczta robocza?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1043
 #, 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:1051
 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:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -6107,7 +7016,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:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -6116,7 +7025,7 @@ msgstr ""
 "Nie mo©na przyci╠Ф pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -6125,15 +7034,16 @@ msgstr ""
 "BЁ╠d przy automatycznym zapisie listu: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Odnaleziono niezapisane pliki z poprzedniej sesji.\n"
 "Czy chcesz sprСbowaФ je odzyskaФ?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -6143,28 +7053,28 @@ msgstr ""
 "\n"
 "Czy chcesz zapisaФ zmiany?"
 
-#: composer/e-msg-composer.c:1 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:1
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "Wstawienie pliku"
 
-#: composer/e-msg-composer.c:1 composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:2406
 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."
@@ -6172,11 +7082,11 @@ msgstr ""
 "Nie mo©na otworzyФ okna tworzenia listu, poniewa© w komponencie\n"
 "pocztowym nie zostaЁy jeszcze skonfigurowane ©adne to©samo╤ci."
 
-#: composer/evolution-composer.c:1
+#: composer/evolution-composer.c: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 "Evolution - ╤rodowisko do pracy grupowej"
 
@@ -6184,7 +7094,7 @@ msgstr "Evolution - ╤rodowisko do pracy grupowej"
 msgid "address card"
 msgstr "karta adresowa"
 
-#: data/evolution.keys.in.h:1
+#: data/evolution.keys.in.h:2
 msgid "calendar information"
 msgstr "informacje kalendarza"
 
@@ -6192,145 +7102,156 @@ msgstr "informacje kalendarza"
 msgid "Body contains"
 msgstr "Tre╤Ф zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:2
 msgid "Body does not contain"
 msgstr "Tre╤Ф nie zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:3
 msgid "Body or subject contains"
 msgstr "Tre╤Ф lub temat zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Nazwa zawiera"
+
+#: default_user/searches.xml.h:5
 msgid "Recipients contain"
 msgstr "Lista odbiorcСw zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:6
 msgid "Sender contains"
 msgstr "Nadawca zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:7
 msgid "Subject contains"
 msgstr "Temat zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:8
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:1 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
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:240
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1531
 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:274
+#: e-util/e-time-utils.c:362
 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:277
+#: e-util/e-time-utils.c:354
 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:1
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: e-util/e-time-utils.c:1
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr "%Y/%m/%d"
 
-#: e-util/e-time-utils.c:1
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, 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:308
+#: 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:313
 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:322
 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 "Nie zestaЁa wybrana data."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "ZostaЁa wybrana niepoprawna data."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -6339,7 +7260,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."
@@ -6347,7 +7268,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"
@@ -6358,57 +7279,57 @@ 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:725
 msgid "now"
 msgstr "teraz"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:575
 msgid " ago"
 msgstr " temu"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:621
 msgid "ago"
 msgstr "temu"
 
-#: filter/filter-datespec.c:1 mail/message-list.c:1
+#: filter/filter-datespec.c:711 mail/message-list.c:936
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<kliknij, aby wybraФ datЙ>"
 
-#: filter/filter-editor.c:1 filter/filter.glade.h:1
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "ReguЁy filtrСw"
 
 #. and now for the action area
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c: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."
@@ -6416,20 +7337,20 @@ msgstr ""
 "Nie zostaЁ wybrany folder.\n"
 "WrСФ i podaj folder, do ktСrego powinna byФ dostarczona poczta."
 
-#: filter/filter-folder.c:1 filter/vfolder-rule.c:1
-#: mail/mail-account-gui.c:1
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "WybСr folderu"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Podaj URI folderu"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybraФ folder> "
 
-#: filter/filter-input.c:1
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6438,321 +7359,313 @@ msgstr ""
 "BЁ╠d w wyra©eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:1
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c: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:647
 msgid "If"
 msgstr "Lista warunkСw"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Wykonywanie czynno╤ci"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "przy speЁnieniu wszystkich kryteriСw"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "przy speЁnieniu ktСregokolwiek z kryteriСw"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Dodaj kryterium"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "nadchodz╠ce"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:770
 msgid "outgoing"
 msgstr "wychodz╠ce"
 
 #: filter/filter.glade.h:1
-msgid "Add"
-msgstr "Dodaj"
-
-#: filter/filter.glade.h:1
-msgid "Edit"
-msgstr "Edycja"
-
-#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Modyfikacja filtrСw"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Modyfikacja VFolderСw"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Nadchodz╠ce"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Wychodz╠ce"
 
-#: filter/filter.glade.h:1 filter/vfolder-editor.c:1
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Wirtualne foldery"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:11
 msgid "specific folders only"
 msgstr "tylko okre╤lone foldery"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "╛rСdЁa VFolderСw"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:13
 msgid "with all active remote folders"
 msgstr "ze wszystkimi aktywnymi zdalnymi folderami"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:14
 msgid "with all local and active remote folders"
 msgstr "ze wszystkimi lokalnymi i aktywnymi zdalnymi folderami"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:15
 msgid "with all local folders"
 msgstr "ze wszystkimi lokalnymi folderami"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
 msgstr "Przypisz kolor"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Przypisz punkty"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "ZaЁ╠czniki"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Skopiuj do folderu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Data otrzymania"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Data wysЁania"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "UsuniЙty"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Nie istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Roboczy"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Wyra©enie"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Wa©ny"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Lista dyskusyjna"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Tre╤Ф listu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "NagЁСwek listu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "List zostaЁ otrzymany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "List zostaЁ wysЁany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Przenie╤ do folderu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Przeczytany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Lista odbiorcСw"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Dopasowanie wg regexp"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:24
 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:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Punkty"
 
-#: filter/libfilter-i18n.h:1 mail/mail-callbacks.c:1
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Nadawca"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Ustaw stan"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:28
 msgid "Size (kB)"
 msgstr "Rozmiar (KB)"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Konto ╪rСdЁowe"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Okre╤lony nagЁСwek"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:32
 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:33 mail/mail-format.c:889
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Temat"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:36
 msgid "contains"
 msgstr "zawiera"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:37
 msgid "does not contain"
 msgstr "nie zawiera"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:38
 msgid "does not end with"
 msgstr "nie koЯczy siЙ na"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:39
 msgid "does not exist"
 msgstr "nie istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:40
 msgid "does not sound like"
 msgstr "nie brzmi jak"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:41
 msgid "does not start with"
 msgstr "nie rozpoczyna siЙ od"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:42
 msgid "ends with"
 msgstr "koЯczy siЙ na"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:43
 msgid "exists"
 msgstr "istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:44
 msgid "is greater than"
 msgstr "jest wiЙkszy ni©"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:45
 msgid "is less than"
 msgstr "jest mniejszy ni©"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:46
 msgid "is not"
 msgstr "nie jest"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:47
 msgid "is"
 msgstr "jest"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:48
 msgid "on or after"
 msgstr "w lub po"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:49
 msgid "on or before"
 msgstr "w lub przed"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "brzmi jak"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "rozpoczyna siЙ od"
 
-#: 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 "ReguЁy punktacji"
 
-#: filter/vfolder-rule.c:1
+#: filter/vfolder-rule.c:198
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Nale©y podaФ jako ╪rСdЁo przynajmniej jeden folder."
 
-#: importers/elm-importer.c:1 importers/evolution-gnomecard-importer.c:1
-#: importers/netscape-importer.c:1 importers/pine-importer.c:1
-#: shell/e-shell-importer.c:1 shell/importer/intelligent.c:1
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Import"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 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?"
@@ -6760,15 +7673,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 "Poczta Elma"
 
-#: 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?"
@@ -6776,11 +7689,11 @@ msgstr ""
 "Odnaleziono pliki programu GnomeCard.\n"
 "Czy chcesz zaimportowaФ je do Evolution?"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6788,7 +7701,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?"
@@ -6796,7 +7709,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"
 
@@ -6804,204 +7717,208 @@ 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 "Komponent zestawienia wykonawczego poczty Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Evolution mail folder display component."
 msgstr "Komponent wy╤wietlania folderu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Evolution mail folder factory component."
 msgstr "Generator komponentСw folderu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Factory for the Evolution composer."
 msgstr ""
 
-#: 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:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "VFolder w oparciu o listЙ dyskusyjn╠"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr "Ten folder nie mo©e zawieraФ listСw."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr "WЁa╤ciwo╤ci..."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr "Zmienia wЁa╤ciwo╤ci folderu"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:757
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:757
 msgid "New _Mail Message"
 msgstr "Nowy _list"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie mo©na zainicjowaФ komponentu pocztowego Evolution."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:1
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "WЁa╤ciwo╤ci \"%s\""
 
-#: mail/folder-browser-ui.c:1
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "WЁa╤ciwo╤ci"
 
-#: mail/folder-browser.c:1 mail/mail-display.c:1
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:909
 msgid "Create vFolder from Search"
 msgstr "StwСrz vFolder na podstawie wyszukiwania"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawcЙ"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorcСw"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _listЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawcЙ"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorcСw"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_stЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Zapisz j_ako..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Odpowiedz nadawcy"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Odpowiedz na _listЙ"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Prze╤lij"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytany"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1309 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:1311
 msgid "Mark as _Important"
 msgstr "Oznacz jako _wa©ny"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr "Oznacz jako _niewa©ny"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "P_rzenie╤ do folderu..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Skopiuj do folderu..."
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Cofnij usuniЙcie"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "Dodaj nadawcЙ do ksi╠©ki adresowej"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "StwСrz _reguЁЙ na podstawie listu"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filtr w oparciu o listЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "VFolder w oparciu o listЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1499
 #, 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:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder w oparciu o listЙ dyskusyjn╠ (%s)"
 
-#: mail/folder-info.c:1
+#: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Pobieranie informacji o folderze"
 
@@ -7009,7 +7926,7 @@ msgstr "Pobieranie informacji o folderze"
 msgid "Factory to import mbox into Evolution"
 msgstr "Generator importu plikСw mbox do Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
 msgid "Imports mbox files into Evolution"
 msgstr "Impurtuje pliki mbox do Evolution."
 
@@ -7017,7 +7934,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."
 
@@ -7025,15 +7942,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"
@@ -7044,37 +7961,37 @@ 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
 msgid "Evolution News Editor"
 msgstr "Edytor nowin Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:1
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "Zapisz podpis"
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -7084,64 +8001,68 @@ msgstr ""
 "\n"
 "Czy chcesz je zapisaФ?"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (domy╤lne)"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Unieaktywnij"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Uaktywnij"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:280
 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:284
 msgid "Don't delete"
 msgstr "Nie usuwaj"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr "Rzeczywi╤cie usun╠Ф konto?"
 
-#: mail/mail-accounts.c:1 mail/mail-accounts.c:1
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "Czy na pewno chcesz usun╠Ф to konto?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:1 mail/mail-config.glade.h:1
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Ustawienia poczty"
 
-#: 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"
@@ -7149,7 +8070,7 @@ 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."
@@ -7157,7 +8078,7 @@ msgstr ""
 "Przed wysЁaniem listu nale©y skonfigurowaФ\n"
 "wykorzystywan╠ to©samo╤Ф."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -7165,11 +8086,11 @@ msgstr ""
 "Przed stworzeniem listu nale©y skonfigurowaФ\n"
 "sposСb przekazywania listСw."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:185
 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:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -7177,7 +8098,7 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "Rzeczywi╤cie wysЁaФ?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -7185,32 +8106,37 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:339
 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:390
 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:632
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "W li╤cie z %a, %d-%m-%Y, godz. %H:%M, %%s pisze: "
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:895
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "PrzesЁany list"
+
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Przeniesienie listСw do folderu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Kopiowanie listСw do folderu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1366
 #, 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:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -7218,7 +8144,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:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -7226,36 +8152,41 @@ msgstr ""
 "Listy zapisane w folderze WysЁane\n"
 "mo©na tylko wysЁaФ ponownie."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1434
 #, 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:1455
 msgid "No Message Selected"
 msgstr "Nie zaznaczono ©adnego listu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Zapis listu pod podan╠ nazw╠"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Zapis listСw pod podan╠ nazw╠"
 
-#: mail/mail-callbacks.c:1 widgets/misc/e-messagebox.c:1
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Ostrze©enie"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1714
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages. \n"
-" \n"
-" Really erase these messages? "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Nie pytaj o to ponownie"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -7264,58 +8195,65 @@ msgstr ""
 "BЁ╠d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Wydruk listu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiodЁo siЙ"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2012
 #, 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:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "Wprowad╪ poni©ej swoje nazwisko i adres e-mail. Pola oznaczone jako "
 "\"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:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:558
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
@@ -7324,16 +8262,16 @@ msgstr "Druid kont Evolution"
 #. * name. I don't think this will work with maildir. How can we figure out
 #. * what shortcut to insert?
 #.
-#: mail/mail-config.c:1
+#: mail/mail-config.c:1579
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Nadchodz╠ce"
 
-#: mail/mail-config.c:1
+#: mail/mail-config.c:1809
 msgid "Checking Service"
 msgstr "Sprawdzanie usЁugi"
 
-#: mail/mail-config.c:1 mail/mail-config.c:1
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Nawi╠zywanie poЁ╠czenia z serwerem..."
 
@@ -7341,59 +8279,59 @@ msgstr "Nawi╠zywanie poЁ╠czenia z serwerem..."
 msgid " color"
 msgstr " "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ta kopia Evolution nie obsЁuguje SSL-a)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Zarz╠dzanie kontami"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Konta"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:9
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:1 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "ZaЁ╠cznik"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Typ uwierzytelniania: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr "ID certyfikatu:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Nowe listy"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7408,233 +8346,238 @@ msgstr ""
 "\n"
 "Kliknij \"ZakoЯcz\", aby zapisaФ ustawienia."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "_Domy╤lne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:23
 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:24
 msgid "Default character encoding: "
 msgstr "Domy╤lne kodowanie znakСw: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:26
 msgid "Display"
 msgstr "Wy╤wietl"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:1 shell/e-local-storage.c:1
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Szkice"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Folder ze szkicami:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:30
 msgid "E_nable"
 msgstr "_Uaktywnij"
 
-#: 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:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Zapisuje bie©╠cy plik pod inn╠ nazw╠"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Zmodyfikuj..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Aktywne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "Plik z podpisem w HTML-u:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "To©samo╤Ф"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "Listy napisane w HTML-u"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Tre╤Ф listu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "PoЁo©enie skrzynki"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Ustawienie jako konto _domy╤lne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "Serwer NNTP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Nowiny"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "ID klucza PGP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "WybСr koloru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:57
 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:58
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Potwierdzanie przy wysyЁaniu listu tylko z _ukrytymi adresatami (bcc:)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Opcje odbioru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "BezpieczeЯstwo"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "WybСr pliku dziennika komunikatСw o filtrowaniu..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "WybСr pliku programu PGP"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "WysyЁanie listСw"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "WysyЁanie listСw"
 
-#: mail/mail-config.glade.h:1 mail/message-list.etspec.h:1
-#: shell/e-local-storage.c:1
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "WysЁane"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Listy wysЁane i szkice"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Folder z wysЁanymi listami"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Typ serwera:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Plik z podpisem:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "╛rСdЁo"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Informacje o ╪rСdle"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "╛rСdЁa"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Foldery specjalne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr "Wykorzystanie bezpiecznego poЁ╠czenia (_SSL)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -7644,343 +8587,348 @@ msgstr ""
 "\n"
 "Aby rozpocz╠Ф, kliknij \"NaprzСd\"."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "Pobieranie _obrazСw z sieci w ka©dym przypadku"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
 msgstr "_Automatyczne sprawdzanie nowych listСw co"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
 msgstr "_Sprawd╪ obsЁugiwane typy "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
 msgstr "Adres _e-mail:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:97
 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:98
 msgid "_Full Name:"
 msgstr "_PeЁna nazwa:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "Podpis w _HTML-u"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr "_Oznaczanie cytatСw za pomoc╠ koloru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
 msgstr "_Komputer:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:102
 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:103
 msgid "_Log filter actions to:"
 msgstr "_Dziennik komunikatСw o filtrowaniu:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
 msgstr "_Oznaczanie listСw jako \"przeczytanych\" po"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:106
 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:107
 msgid "_Organization:"
 msgstr "_Organizacja:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr "╕cie©ka programu _PGP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "╕_cie©ka:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr "_PamiЙtanie dЁugiego hasЁa PGP a© do zakoЯczenia"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_ZapamiЙtanie hasЁa"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:112
 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:113
 msgid "_Signature file:"
 msgstr "Plik z p_odpisem:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "Nazwa _u©ytkownika:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr "placeholder"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:118
 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:222
 msgid "Save Attachment"
 msgstr "Zapis zaЁ╠cznika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Zapisz na dysk..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Wy╤wietl na miejscu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "OtwСrz za pomoc╠ programu %s..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:406
 #, 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:410
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "ZewnЙtrzna przegl╠darka"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Wczytywanie tre╤ci listu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "OtwСrz odno╤nik w przegl╠darce"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Skopiuj adres odno╤nika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr "Zapisz odno╤nik jako (FIXME)"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1417
 msgid "Save Image as..."
 msgstr "Zapisz obraz jako..."
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:147
 #, 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:1
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr "ukrytych: %d"
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:161
 #, c-format
 msgid "%d selected"
 msgstr "zaznaczonych: %d"
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr "niewysЁanych: %d"
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr "ogСЁem: %d"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "ZaЁ╠cznik %s"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Nie mo©na przetworzyФ jako list MIME. Wy╤wietlanie w postaci ╪rСdЁowej."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:856
 msgid "Bad Address"
 msgstr "Niepoprawny adres"
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr "Odpowied╪ do"
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Dla"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "Nie skonfigurowano programu GPG/PGP."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "Nie wy╤wietlono zaszyfrowanego listu"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "List zaszyfrowany"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Kliknij ikonЙ aby rozszyfrowaФ."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "List zostaЁ podpisany cyfrowo i potwierdzono jego autentyczno╤Ф."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "List zostaЁ podpisany cyfrowo lecz nie potwierdzono jego autentyczno╤ci."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska╪nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Wska╪nik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska╪nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2109
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Wska╪nik na zdalne dane (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2117
 #, 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:2122
 msgid "Malformed external-body part."
 msgstr "Niepoprawna forma czЙ╤ci external-body."
 
-#: mail/mail-local.c:1
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Folder \"%s\" nie istnieje"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Otwieranie \"%s\""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie folderu \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:869
 #, 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:909
 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:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nie mo©na zmieniФ formatu zdalnego folderu."
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1013
 #, 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"
@@ -7989,7 +8937,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"
@@ -7999,116 +8947,126 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "ZapamiЙtanie hasЁa"
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Przetwarzanie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:84
 msgid "Filtering Folder"
 msgstr "Filtrowanie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:227
 msgid "Fetching Mail"
 msgstr "Pobieranie poczty"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "WysyЁanie \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "WysyЁanie %d. listu z %d"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:728
 #, 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:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Gotowe."
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie listСw do %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie listСw do %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Kopiowanie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie folderСw w \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1 mail/mail-ops.c:1 shell/e-local-storage.c:1
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "╕mietnik"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "PrzesЁane listy"
 
-#: mail/mail-ops.c:1 mail/mail-ops.c:1
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Otwieranie folderu %s"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synchronizowanie folderu"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Od╤wie©anie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Pobieranie %d listСw"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie %d listСw"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -8117,7 +9075,7 @@ msgstr ""
 "Nie mo©na stworzyФ pliku wyj╤ciowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -8126,11 +9084,11 @@ msgstr ""
 "BЁ╠d przy zapisie listСw do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Zapisywanie zaЁ╠cznika"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -8139,213 +9097,213 @@ msgstr ""
 "Nie mo©na stworzyФ pliku wyj╤ciowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo©na zapisaФ danych: %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "OdЁ╠czanie od %s"
 
-#: mail/mail-search-dialogue.c:1
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Znajd╪"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(List bez nazwy)"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:237
 msgid "Untitled Message"
 msgstr "List bez nazwy"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:241
 msgid "Empty Message"
 msgstr "Pusty list"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "Wyszukiwanie w li╤cie"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "Z rozrС©nianiem maЁych i wielkich liter"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr "Wyszukiwanie w przСd"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Znajd╪:"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Dopasowania:"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "Anulowanie..."
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Wy╤lij i odbierz pocztЙ"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: mail/mail-send-recv.c:1 mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:182
 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 "Nie mo©na stworzyФ tymczasowego pliku mbox \"%s\": %s"
 
-#: 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
+#: mail/mail-tools.c:245
 msgid "Forwarded message"
 msgstr "PrzesЁany list"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:471
 msgid "Forwarded Message"
 msgstr "PrzesЁany list"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-browser.c:1
+#: mail/message-browser.c:125
 msgid "(No subject)"
 msgstr "(Brak tematu)"
 
-#: mail/message-browser.c:1
+#: mail/message-browser.c:127
 #, c-format
 msgid "%s - Message"
 msgstr "%s - List"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:1
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:1
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Wiele listСw"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "Najni©szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Ni©szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "Wy©szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "Najwy©szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Dzi╤ %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:2312
 msgid "Generating message list"
 msgstr "Aktualizowanie zestawienia listСw"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Oznaczony"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Odebrany"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Rozmiar"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:174
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Analizowanie folderСw pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:176
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Analizowanie gЁСwnych folderСw na \"%s\""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subskrybowanie folderu \"%s\""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odsubskrybowywanie folderu \"%s\""
 
-#: mail/subscribe-dialog.c:1 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Folder"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:1490
 msgid "No server has been selected"
 msgstr "Nie wybrano serwera"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
 msgstr "Wybierz serwer."
 
@@ -8353,31 +9311,31 @@ msgstr "Wybierz serwer."
 msgid " _Refresh List "
 msgstr " _Od╤wie© listЙ "
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:2
 msgid "All folders"
 msgstr "Wszystkie foldery"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:3
 msgid "Display options"
 msgstr "Opcje wy╤wietlania"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:4
 msgid "Folders whose names begin with:"
 msgstr "Foldery o nazwach rozpoczynaj╠cych siЙ od:"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "Zarz╠dzanie subskrybcjami"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:6
 msgid "Show _folders from server: "
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Zasubskrybuj"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_Odsubskrybuj"
 
@@ -8385,31 +9343,35 @@ msgstr "_Odsubskrybuj"
 msgid "Evolution component for the executive summary."
 msgstr "Komponent Evolution obsЁuguj╠cy zestawienie wykonawcze."
 
-#: 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 "Generator komponentu zestawienia wykonawczego Evolution."
 
-#: my-evolution/component-factory.c:1
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Nie mo©na zainicjowaФ komponentu zestawienia wykonawczego Evolution."
 
-#: my-evolution/e-summary-calendar.c:1 my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Terminy"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:183
 msgid "No appointments"
 msgstr "Brak terminСw"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:236
 msgid "%l:%M%p"
 msgstr "%l:%M%p"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:238
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:1
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "Zestawienie poczty"
 
@@ -8417,205 +9379,206 @@ msgstr "Zestawienie poczty"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:1
-#: my-evolution/e-summary-weather.c:1
-msgid "ENBR:EGAC:EGAA"
-msgstr "EPWA:EPKK:EPPO:EPSC"
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr "SЁowo dnia Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr "Cytaty dnia"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:877
 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:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Podaj URL ╪rСdЁa nowo╤ci, ktСre chcesz dodaФ"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:889
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:1421
 msgid "Summary Settings"
 msgstr "Ustawienia zestawienia"
 
-#: my-evolution/e-summary-rdf.c:1
+#: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
 msgstr "Podczas pobierania danych ze ╪rСdЁa nowo╤ci wyst╠piЁ bЁ╠d"
 
-#: my-evolution/e-summary-rdf.c:1 my-evolution/e-summary-rdf.c:1
+#: 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-rdf.c:1
-msgid "RDF Summary"
-msgstr "Zestawienie RDF"
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "╛_rСdЁa nowo╤ci"
 
-#: my-evolution/e-summary-tasks.c:1
+#: my-evolution/e-summary-tasks.c:213
 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
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem pogodowym</b></dd>"
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:512
 msgid "Weather"
 msgstr "Pogoda"
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Regiony"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:145
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B, %Y"
 
-#: my-evolution/e-summary.c:1 ui/my-evolution.xml.h:1
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Wydrukuj"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:518
 msgid "Printing of Summary failed"
 msgstr "Wydrukowanie zestawienia nie powiodЁo siЙ"
 
-#: my-evolution/main.c:1
+#: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent zestawienia wykonawczego nie mСgЁ zainicjowaФ Bonobo.\n"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:29
 msgid "╟F"
 msgstr "╟F"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:29
 msgid "╟C"
 msgstr "╟C"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:33
 msgid "knots"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:33
 msgid "kph"
 msgstr "km/h"
 
 # [cyba] mo©e raczej calHg??
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:38
 msgid "inHg"
 msgstr "inHG"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:38
 msgid "mmHg"
 msgstr "mmHg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:41
 msgid "miles"
 msgstr "mile"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:41
 msgid "kilometers"
 msgstr "kilometry"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Czyste niebo"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
 msgstr "Fragmentaryczne chmury"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "Rzadkie chmury"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:47
 msgid "Few clouds"
 msgstr "Kilka chmur"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr "Zachmurzenie"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
 msgstr "Niepoprawna warto╤Ф"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr "Zmienny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "PСЁnoc"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "PСЁnoc - pСЁnocny wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "PСЁnocny wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "WschСd - pСЁnocny wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "WschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "WschСd - poЁudniowy wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "PoЁudniowy wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "PoЁudnie - poЁudniowy wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "PoЁudnie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "PoЁudnie - poЁudniowy zachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "PoЁudniowy zachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "ZachСd - poЁudniowy zachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "ZachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "ZachСd - pСЁnocny zachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "PСЁnocny zachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "PСЁnoc - pСЁnocny zachСd"
 
@@ -8623,1057 +9586,1057 @@ 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 "Lekka 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 "ёagodna m©awka"
 
-#: 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 "Burza"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
 msgstr "Wietrzna m©awka"
 
-#: 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 "Zbli©aj╠ca siЙ m©awka"
 
-#: 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 "Lekki 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 "ёagodny deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
 msgstr "CzЙ╤ciowe opady"
 
-#: 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 "Przelotny deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Drifting rain"
 msgstr "Zbli©aj╠cy siЙ deszcz"
 
-#: 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 "Lekki ╤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 "ёagodny ╤nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
 msgstr "CzЙ╤ciowe opady ╤niegu"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
 msgstr "Burza ╤nie©na"
 
-#: 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 "Zbli©aj╠cy siЙ ╤nieg"
 
-#: 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 "Ziarna ╤niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
 msgstr "Nadchodz╠ce ziarna ╤niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
 msgstr "Lekkie ziarna ╤niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
 msgstr "Umiarkowane ziarna ╤niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
 msgstr "Obfite ziarna ╤niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
 msgstr "SЁabe ziarna ╤niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
 msgstr "ёagodne ziarna ╤niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
 msgstr "CzЙ╤ciowe ziarna ╤niegu"
 
-#: 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 "Zbli©aj╠ce siЙ ziarna ╤niegu"
 
-#: 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 "KrysztaЁki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr "Nadchodz╠ce krysztaЁki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr "Nieco krysztaЁkСw lodowych"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr "Umiarkowane krysztaЁki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
 msgstr "Obfite krysztaЁki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr "ёagodne krysztaЁki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr "CzЙ╤ciowe krysztaЁki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr "Burza z krysztaЁkami lodowymi"
 
-#: 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 "Zbli©aj╠ce siЙ krysztaЁki lodu"
 
-#: 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 "Kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
 msgstr "Nadchodz╠ce kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
 msgstr "Nieco kulek lodowych"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
 msgstr "Umiarkowane kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
 msgstr "Obfite kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
 msgstr "SЁabe kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
 msgstr "ёagodne kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
 msgstr "CzЙ╤ciowe kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
 msgstr "Burza z kulkami lodowymi"
 
-#: 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 "Zbli©aj╠ce siЙ kulki lodowe"
 
-#: 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 "Lekki 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 "ёagodny grad"
 
-#: 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 "Zbli©aj╠cy siЙ grad"
 
-#: 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 "ёagodny gradzik"
 
-#: 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 "Zbli©aj╠cy siЙ gradzik"
 
-#: 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 "Lekkie 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 "ёagodne opady"
 
-#: 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 "Nieznana burza"
 
-#: 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 "Zbli©aj╠ce siЙ opady"
 
-#: 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 "Lekka 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 "ёagodna mgieЁka"
 
-#: 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 "Zbli©aj╠ca siЙ mgieЁka"
 
-#: 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 "Lekka 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 "ёagodna mgЁa"
 
-#: 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 "Zbli©aj╠ca siЙ mgЁa"
 
-#: 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 "ёagodny dym"
 
-#: 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 "Dym z grzmotami"
 
-#: 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 "Zbli©aj╠cy siЙ dym"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr "PopiСЁ wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr "Nadchodz╠cy popiСЁ wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr "Umiarkowany popiСЁ wulkaniczny"
 
-#: 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 "SЁaby popiСЁ wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr "ёagodny popiСЁ wulaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr "CzЙ╤ciowy popiСЁ wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr "PopiСЁ wulkaniczny z grzmotami"
 
-#: 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 "Zbli©aj╠cy siЙ popiСЁ wulkaniczny"
 
-#: 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 "Zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr "Nadchodz╠ce zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr "Lekkie zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr "Umiarkowane zamglenie"
 
-#: 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 "SЁabe zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr "ёagodne zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr "CzЙ╤ciowe zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr "Zamglenie z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr "Zbli©aj╠ce siЙ zamglenie"
 
-#: 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 "PyЁ wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
 msgstr "Nadchodz╠cy pyЁ wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Light sprays"
 msgstr "Lekki pyЁ wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
 msgstr "Umiarkowany pyЁ wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
 msgstr "Obfity pyЁ wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
 msgstr "SЁaby pyЁ wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
 msgstr "ёagodny pyЁ wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
 msgstr "CzЙ╤ciowy pyЁ wodny"
 
-#: 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 "Zbli©aj╠cy siЙ pyЁ wodny"
 
-#: 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 "Tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr "Nadchodz╠ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr "Lekkie tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr "Umiarkowane tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr "Obfite tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr "ёagodne tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr "CzЙ╤ciowe tumany kurzu"
 
-#: 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 "Zbli©aj╠ce siЙ tumany kurzu"
 
 #. SQUALL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Squall"
 msgstr "NawaЁnica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
 msgstr "Nadchodz╠ca nawaЁnica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Light squall"
 msgstr "Lekka nawaЁnica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
 msgstr "Umiarkowana nawaЁnica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
 msgstr "Obfita nawaЁnica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Partial squall"
 msgstr "ёagodna nawaЁnica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
 msgstr "OgЁuszaj╠ca nawaЁnica"
 
-#: 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 "Zbli©aj╠ca siЙ nawaЁnica"
 
-#: 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 "Burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
 msgstr "Nadchodz╠ca burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
 msgstr "Lekka burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
 msgstr "Umiarkowana burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
 msgstr "Obfita burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
 msgstr "SЁaba burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
 msgstr "ёagodna burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
 msgstr "OgЁuszaj╠ca burza piaskowa"
 
-#: 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 "Zbli©aj╠ca siЙ burza piaskowa"
 
-#: 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 "Kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
 msgstr "Nadchodz╠ca kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
 msgstr "Lekka kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
 msgstr "Umiarkowana kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
 msgstr "Obfita kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
 msgstr "SЁaba kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
 msgstr "ёagodna kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
 msgstr "OgЁuszaj╠ca kurzawa"
 
-#: 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 "Zbli©aj╠ca siЙ kurzawa"
 
-#: 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 "Szalej╠ce tornado"
 
-#: 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 "OgЁuszaj╠ce tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr "Zbli©aj╠ce siЙ tornado"
 
-#: 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 ""
 
@@ -9681,119 +10644,115 @@ msgstr ""
 msgid " _Remove"
 msgstr " _UsuЯ"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ew feed"
 msgstr "Dodaj ╪_rСdЁo"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:3
 msgid "Al_l stations:"
 msgstr "Wszystkie _stacje:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:4
 msgid "All _folders:"
 msgstr "Wszystkie f_oldery:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:5
 msgid "All news _feeds:"
 msgstr "Wszystkie ╪_rСdЁa nowo╤ci:"
 
-#: my-evolution/my-evolution.glade.h:1 shell/e-local-storage.c:1
-msgid "Calendar"
-msgstr "Kalendarz"
-
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:7
 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:8
 msgid "Ma_x number of items shown:"
 msgstr "Maksymalna liczba wy╤wietlanych _elementСw:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:9
 msgid "News Feed Settings"
 msgstr "Ustawienia ╪rСdeЁ nowo╤ci"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:10
 msgid "One mont_h"
 msgstr "Jeden _miesi╠c"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:11
 msgid "One w_eek"
 msgstr "Jeden _tydzieЯ"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:12
 msgid "Refresh _time (seconds):"
 msgstr "_Okres od╤wie©ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Wy╤wietlanie _wszystkich zadaЯ"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Wy╤wietlanie _dzisiejszych zadaЯ"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Zadania "
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:16
 msgid "Units: "
 msgstr "Jednostki: "
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Ustawienia dotycz╠ce pogody"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Display folders:"
 msgstr "_Wy╤wietlane foldery:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Display stations:"
 msgstr "_Wy╤wietlane stacje:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:21
 msgid "_Displayed feeds:"
 msgstr "_Wy╤wietlane ╪rСdЁa:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Five days"
 msgstr "_PiЙФ dni"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Mail"
 msgstr "_Poczta"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:24
 msgid "_News Feeds"
 msgstr "╛_rСdЁa nowo╤ci"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:25
 msgid "_One day"
 msgstr "_Jeden dzieЯ"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:26
 msgid "_Refresh time (seconds):"
 msgstr "_Okres od╤wie©ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:27
 msgid "_Schedule"
 msgstr "Pl_anowanie"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:28
 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:29
 msgid "_Weather"
 msgstr "P_ogoda"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:30
 msgid "_imperial"
 msgstr "_imperialne"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:31
 msgid "m_etric"
 msgstr "_metryczne"
 
@@ -9801,31 +10760,31 @@ 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-local-storage.c:1
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
 msgid "Inbox"
 msgstr "Nadchodz╠ce"
 
-#: shell/e-local-storage.c:1
+#: shell/e-local-storage.c:178
 msgid "Outbox"
 msgstr "Wychodz╠ce"
 
-#: shell/e-local-storage.c:1
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Lokalne foldery"
 
-#: shell/e-setup.c:1 shell/e-setup.c:1
+#: 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"
@@ -9833,23 +10792,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"
@@ -9860,7 +10819,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"
@@ -9869,7 +10828,7 @@ msgstr ""
 "Wyst╠piЁ bЁ╠d przy kopiowaniu plikСw do\n"
 "\"%s\"."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9880,7 +10839,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:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9893,7 +10852,7 @@ msgstr ""
 "jego usuniЙcie.\n"
 "Czy chcesz usun╠Ф ten katalog?"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9904,37 +10863,37 @@ 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:174
 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:176
 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:190
 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:285
 #, 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:290
 msgid "Copy folder"
 msgstr "Kopiowanie folderu"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:328
 #, 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:333
 msgid "Move folder"
 msgstr "Przeniesienie folderu"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:358
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -9943,35 +10902,35 @@ msgstr ""
 "Nie mo©na usun╠Ф folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "UsuniЙcie folderu \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Czy na pewno chcesz usun╠Ф folder \"%s\"?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Zmiana nazwy folderu \"%s\""
 
-#: shell/e-shell-folder-commands.c:1 shell/e-shortcuts-view.c:1
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "ZmieЯ nazwЙ"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nazwa folderu:"
 
-#: 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"
@@ -9980,15 +10939,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:288
 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."
@@ -9996,15 +10955,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:348
 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:582 shell/e-shell-folder-title-bar.c:583
 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"
@@ -10020,7 +10979,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"
@@ -10031,7 +10990,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"
@@ -10040,7 +10999,7 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie %d. elementu."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -10049,11 +11008,11 @@ msgstr ""
 "╞aden z importerСw nie potrafi obsЁu©yФ pliku\n"
 "%s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:362
 msgid "Importing"
 msgstr "Importowanie"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:370
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -10062,17 +11021,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"
@@ -10081,47 +11040,69 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:488
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:538
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:543
 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:623
 msgid "Select folder"
 msgstr "WybСr folderu"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:624
 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:564
 msgid "Closing connections..."
 msgstr "Zamykanie poЁ╠czeЯ..."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Nie mo©na zainicjowaФ powЁoki Evolution: %s"
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 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:191
 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:219
 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:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -10137,67 +11118,67 @@ msgstr ""
 "prosimy wysyЁaФ na adres:\n"
 "translators@gnome.pl"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Przej╤cie do innego folderu..."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:424
 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:569
 msgid "Create a new shortcut"
 msgstr "Tworzy nowy skrСt"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Wybierz folder, na ktСry ma wskazywaФ skrСt:"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr "Praca z podЁ╠czeniem"
 
-#: shell/e-shell-view-menu.c:1 shell/e-shell-view-menu.c:1
-#: ui/evolution.xml.h:1
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Praca bez podЁ╠czenia"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Nie wy╤wietlono folderu)"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1499
 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:1506
 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:1512
 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:509
 #, 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:1438
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -10206,35 +11187,35 @@ msgstr ""
 "Widoki obsЁuguj╠ce \"%s\" nieoczekiwanie zakoЯczyЁy dziaЁanie. :-(\n"
 "Prawdopodobnie oznacza to bЁ╠d komponentu %s."
 
-#: shell/e-shell.c:1 widgets/misc/e-cell-date-edit.c:1
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1646
 msgid "Cannot register on OAF"
 msgstr "Nie mo©na dokonaФ rejestracji na serwerze OAF"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
-#: shell/e-shell.c:1 shell/e-storage.c:1
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "BЁ╠d ogСlny"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Tworzenie nowej grupy skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -10243,148 +11224,158 @@ 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:176
 msgid "Don't remove"
 msgstr "Nie usuwaj"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
 msgstr "Zmiana nazwy grupy skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:205
 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:218
 msgid "_Small Icons"
 msgstr "_MaЁe ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:219
 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:221
 msgid "_Large Icons"
 msgstr "_Du©e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:222
 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:233
 msgid "_New Group..."
 msgstr "_Nowa grupa..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Tworzy now╠ grupЙ skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:236
 msgid "_Remove this Group..."
 msgstr "_UsuЯ grupЙ..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Usuwa tЙ grupЙ skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:239
 msgid "Re_name this Group..."
 msgstr "_ZmieЯ nazwЙ grupy..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
 msgstr "Zmienia nazwЙ grupy skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ukryj pasek skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Ukrywa pasek skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
 msgstr "Zmiana nazwy skrСtu"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:366
 msgid "Rename selected shortcut to:"
 msgstr "ZmieЯ nazwЙ wybranego skrСtu na:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:378
 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:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "OtwСrz w nowym oknie"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:380
 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:383
 msgid "Rename this shortcut"
 msgstr "Zmienia nazwЙ skrСtu"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:385
 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:641
 msgid "Error saving shortcuts."
 msgstr "BЁ╠d przy zapisywaniu skrСtСw."
 
-#: shell/e-storage.c:1 shell/e-storage.c:1
+#: shell/e-shortcuts.c:1040
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_SkrСt"
+
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Bez nazwy)"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "bez bЁЙdu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:493
 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:495
 msgid "The specified folder type is not valid"
 msgstr "Podany typ folderu nie jest poprawny"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "BЁ╠d We/Wy"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Brak miejsca na stworzenie folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Nie odnaleziono okre╤lonego folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "NieobsЁugiwana operacja"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:511
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nie mo©na zmodyfikowaФ ani usun╠Ф podanego folderu"
 
-#: shell/e-task-widget.c:1
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Nie mo©na skopiowaФ folderu do jego folderu podrzЙdnego."
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:1
+#: shell/e-task-widget.c:175
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zakoЯczono %d%%)"
@@ -10393,25 +11384,25 @@ 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:"
 
-#: 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:"
 
@@ -10419,23 +11410,23 @@ 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 Assistant"
 msgstr "Druid importu Evolution"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:3
 msgid "Evolution Importer Assistant"
 msgstr "Druid importu Evolution"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:4
 msgid "Import File (Step 2 of 2)"
 msgstr "Import pliku (krok 2 z 2)"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:5
 msgid "Select a File (step 1 of 2)"
 msgstr "WybСr pliku (krok 1 z 2)"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:6
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -10445,23 +11436,23 @@ msgstr ""
 "Druid ten przeprowadzi ciЙ przez proces importu do Evolution\n"
 "zewnЙtrznych plikСw w wybranym formacie."
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c: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 can import data from the following files:"
 msgstr "Mo©na zaimportowaФ do Evolution dane z nastЙpuj╠cych plikСw:"
 
-#: shell/main.c:1
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10490,7 +11481,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:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10498,395 +11489,390 @@ msgstr ""
 "DziЙkujemy\n"
 "ZespСЁ twСrcСw Evolution\n"
 
-#: shell/main.c:1
+#: shell/main.c:173
 msgid "Cannot access the Evolution shell."
 msgstr "Nie mo©na uzyskaФ dostЙpu do powЁoki Evolution."
 
-#: shell/main.c:1
+#: shell/main.c:184
 #, c-format
 msgid "Cannot initialize the Evolution shell: %s"
 msgstr "Nie mo©na zainicjowaФ powЁoki Evolution: %s"
 
-#: shell/main.c:1
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "Ukrywa okno powitalne"
 
-#: shell/main.c:1
+#: shell/main.c:229
 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:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo©na zainicjowaФ systemu komponentСw Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-mail-list.xml.h:1
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Kopiuje zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:5
 msgid "Create new contact list"
 msgstr "Tworzy now╠ listЙ kontaktСw"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-mail-list.xml.h:1
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Wytnij"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Wycina zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Usuwa zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
-msgid "New contact"
-msgstr "Nowy Kontakt"
-
-#: ui/evolution-addressbook.xml.h:1
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "New List"
 msgstr "Nowa lista"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-mail-list.xml.h:1
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Wklej"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Wkleja zawarto╤Ф schowka"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Wy╤wietla podgl╠d kontaktСw w postaci przygotowanej do druku"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Drukuje zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Zapisuje zaznaczone kontakty w formacie VCard."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Zaznacza wszystkie kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
-msgid "Send _contact to other"
-msgstr "Wy╤lij _kontakt do innej osoby"
-
-#: ui/evolution-addressbook.xml.h:1
-msgid "Send _message to contact"
-msgstr "Wy╤lij _list do kontaktu"
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Wy╤lij _list do kontaktu..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send a mess to the selected contacts."
 msgstr "WysyЁa list do wybranych kontaktСw"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Wy╤lij list do kontaktu"
+
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
 msgstr "WysyЁa zaznaczone kontakty do innej osoby."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Zatrzymuje wczytywanie"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
-#: ui/evolution-mail-global.xml.h:1 ui/evolution-mail-list.xml.h:1
-#: ui/evolution-mail-message.xml.h:1 ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "C_zynno╤ci"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "╛rСdЁa ksi╠©ki adresowej..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact List"
 msgstr "Lista _kontaktСw"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/my-evolution.xml.h:1
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Kontakty..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:37
 msgid "_Save as VCard"
 msgstr "_Zapisz jako VCard"
 
-#: ui/evolution-addressbook.xml.h:1
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Szukaj kontaktСw"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "Zaznacz _wszystko"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-mail-global.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution-tasks.xml.h:1
-#: ui/my-evolution.xml.h:1
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_NarzЙdzia"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "Konfiguruje ustawienia kalendarza"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Create a New All-Day _Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All Day _Event"
 msgstr "StwСrz nowe _zdarzenie caЁodniowe"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a New _Task"
+msgstr "Tworzy nowe zadanie"
+
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a _New Appointment"
 msgstr "StwСrz _nowy termin"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Create a new appointment"
-msgstr "Tworzy nowy termin"
-
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "Tworzy nowe zdarzenie caЁodniowe"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "DzieЯ"
 
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-message.xml.h:1
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Usuwa termin"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Przejd╪ do"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back"
 msgstr "Wstecz"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward"
 msgstr "NaprzСd"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Przejd╪ do _daty"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Przechodzi do podanej daty"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to today"
 msgstr "Przechodzi do dzisiaj"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "Miesi╠c"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nowy termin"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Nowe zadanie"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Wy╤wietla podgl╠d kalendarza w postaci przygotowanej do druku"
 
-#: ui/evolution-calendar.xml.h:1 ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
 msgstr "Podgl╠d wy_druku"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this calendar"
 msgstr "Drukuje zawarto╤Ф kalendarza"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Publish Free/Busy Information"
-msgstr "Opublikuj informacjЙ o zajЙto╤ci"
-
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Poblikuje informacjЙ o zajЙto╤ci na podstawie tego kalendarza"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Wy╤wietla jeden dzieЯ"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Wy╤wietla jeden miesi╠c"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Wy╤wietla jeden tydzieЯ"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Show work week"
+#: ui/evolution-calendar.xml.h:31
+#, fuzzy
+msgid "Show the working week"
 msgstr "Wy╤wietla tydzieЯ roboczy"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "TydzieЯ"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "_Termin..."
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "Ustawienia _kalendarza..."
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Opublikuj informacjЙ o zajЙto╤ci"
+
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_Zadanie"
+
+#: 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
-msgid "Close this appointment"
-msgstr "Zamyka termin"
+#: ui/evolution-comp-editor.xml.h:3
+#, fuzzy
+msgid "Close this item"
+msgstr "Usuwa bie©╠cy element"
 
-#: ui/evolution-comp-editor.xml.h:1
-msgid "Delete this appointment"
-msgstr "Usuwa termin"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Usuwa bie©╠cy element"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 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
-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:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Drukuje bie©╠cy element"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Wydrukuj..."
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Zapisz"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Zapisz i zamknij"
 
-#: ui/evolution-comp-editor.xml.h:1
-msgid "Save the appointment and close the dialog box"
-msgstr "Zapisuje termin i zamyka okno"
+#: ui/evolution-comp-editor.xml.h:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Zapisuje listЙ i zamyka okno dialogowe"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Zapisuje bie©╠cy element na dysku"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-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-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Plik"
 
-#: ui/evolution-contact-editor.xml.h:1
-msgid "Delete this item"
-msgstr "Usuwa bie©╠cy element"
-
-#: ui/evolution-contact-editor.xml.h:1
-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-signature-editor.xml.h:1 widgets/misc/e-filter-bar.c:1
-msgid "Save"
-msgstr "Zapisz"
-
-#: 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:6
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Zapisz j_ako..."
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Zapisuje kontakt i zamyka okno dialogowe"
 
-#: ui/evolution-contact-editor.xml.h:1
-msgid "Se_nd contact to other..."
-msgstr "_Wy╤lij kontakt do innej osoby..."
-
-#: ui/evolution-contact-editor.xml.h:1
-msgid "See online help"
-msgstr "Wy╤wietla pomoc"
-
-#: ui/evolution-contact-editor.xml.h:1
-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:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: 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:3
 msgid "Delete this list"
 msgstr "Usuwa tЙ listЙ"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete..."
 msgstr "UsuЯ..."
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Zapisuje listЙ i zamyka okno dialogowe"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "_Wy╤lij listЙ do innej osoby..."
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Wy╤lij _list do listy..."
 
@@ -10894,31 +11880,31 @@ 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
 msgid "Cancel the meeting for this item"
 msgstr "Anuluje spotkanie zwi╠zane z tym elementem"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Prze╤lij jako i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "PrzesyЁa ten element w li╤cie"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr "Pobiera naj╤wie©sze informacje o spotkaniu"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:6
 msgid "Re_fresh Meeting"
 msgstr "_Od╤wie© spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:7
 msgid "Schedule _Meeting"
 msgstr "Zaplanuj _spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Planuje spotkanie zwi╠zane z tym elementem"
 
@@ -10930,94 +11916,95 @@ 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
-msgid "Compose"
-msgstr "Nowy list"
-
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
 msgstr "StwСrz _nowy list"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 "Pozwala na stworzenie i modyfikacjЙ kont pocztowych oraz innych ustawieЯ"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Pozwala na stworzenie lub modyfikacjЙ reguЁ filtrowania listСw"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "Pozwala na stworzenie lub modyfikacjЙ definicji wirtualnych folderСw"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "OprС©nij ╤mie_tnik"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Zapomnij _hasЁa"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zapomina zapamiЙtane hasЁa, co spowoduje ponowne pytanie o nie"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Kolejny list"
+
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "Otwiera okno umo©liwiaj╠ce napisanie nowego listu"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trwale usuwa listy oznaczone do usuniЙcia ze wszystkich folderСw"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Wy╤lij / Odbierz"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "WysyЁa listy w kolejce i pobiera nowe"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr "Wy╤wietla podgl╠d listu w wydzielonej czЙ╤ci okna"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Pozwala za zasubskrybowanie lub odsubskrybowanie folderСw na zdalnych "
 "serwerach"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "_Edytor wirtualnych folderСw..."
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtry..."
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "_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"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:24
 msgid "_Subscribe to Folders..."
 msgstr "_Subskrybcje folderСw..."
 
@@ -11025,106 +12012,111 @@ msgstr "_Subskrybcje folderСw..."
 msgid "Change the properties of this folder"
 msgstr "Zmienia wЁa╤ciwo╤ci folderu"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Kopiuje zaznaczone listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Wytnij"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Wycina zaznaczone listy do schowka"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Ukrycie _zaznaczonych listСw"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Ukrycie _usuniЙtych listСw"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Ukrywanie prz_eczytanych listСw"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Ukrywa listy oznaczone do usuniЙcia, zamiast wy╤wietlania ich z "
 "przekre╤leniem"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Oznacz wszystkie jako przeczy_tane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Oznacza wszystkie widoczne listy jako przeczytane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Wkleja list ze schowka"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trwale usuwa listy oznaczone do usuniЙcia z bie©╠cego folderu"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Zaznacz w_szystkie"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Zaznacz _w╠tek"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Zaznacza wszystkie listy (i tylko te), ktСre obecnie nie s╠ zaznaczone"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Zaznacza wszystkie listy w bie©╠cym w╠tku"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Zaznacza wszystkie widoczne listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "Wy╤wietlanie _ukrytych listСw"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Wy╤wietla listy, ktСre byЁy czasowo ukryte"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Czasowo ukrywa listy, ktСre zostaЁy przeczytane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Czasowo ukrywa zaznaczone listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "PrzeЁ╠cza grupowanie listСw w w╠tki"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h: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:38
 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:29
 msgid "_Properties..."
 msgstr "_WЁa╤ciwo╤ci..."
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
 msgstr "Grupowanie listСw w w╠t_ki"
 
@@ -11132,341 +12124,345 @@ 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
+#: ui/evolution-mail-message.xml.h:24
 msgid "Filter on Mailing _List..."
 msgstr "Filtr w oparciu o li_stЙ dyskusyjn╠..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Se_nder..."
 msgstr "Filtr w oparciu o n_adawcЙ..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on _Recipients..."
 msgstr "Filtr w oparciu o o_dbiorcСw..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:27
 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
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "Oznacz jako wa©n_e"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "Oznacz jako _niewa©ne"
 
-#: 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
 msgid "Mark the selected messages as unimportant"
 msgstr "Oznacza zaznaczone listy jako niewa©ne"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h: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:1
+#: ui/evolution-mail-message.xml.h:52
 msgid "Next Important Message"
 msgstr "Kolejny wa©ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next Message"
 msgstr "Kolejny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Thread"
 msgstr "Kolejny w╠tek"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Unread Message"
 msgstr "Kolejny nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: 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 "Preview the message to be printed"
 msgstr "Wy╤wietla podgl╠d listu w postaci przygotowanej do druku"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:60
 msgid "Previous Important Message"
 msgstr "Poprzedni wa©ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:61
 msgid "Previous Message"
 msgstr "Poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous Unread Message"
 msgstr "Poprzedni nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print this message"
 msgstr "Drukuje list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Wszystkim"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "_Przeszukaj list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:71
 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:72
 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:73
+msgid "Setup the page settings for your current printer"
+msgstr "Ustala ustawienia strony bie©╠cej drukarki"
+
+#: 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:85
 msgid "_Apply Filters"
 msgstr "_Zastosuj filtry"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:87
 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:90
 msgid "_Forward Message"
 msgstr "_Prze╤lij list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr "Wy╤wietlanie lis_tu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "P_rzenie╤ do folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr "_ZwykЁe wy╤wietlanie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "_OtwСrz list"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zamyka bie©╠ce okno"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "Zam_knij"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Widok"
 
@@ -11474,190 +12470,190 @@ 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
 msgid "Inline Text _File..."
 msgstr "Plik _tekstowy..."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Wstawia zawarto╤Ф pliku jako tekst do listu"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Wstaw plik tekstowy.."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "Szyfrowanie S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Zapisz jako"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Zapisz _szkic"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Zapisz w folderze..."
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h: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
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Attachment..."
 msgstr "_ZaЁ╠cznik..."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Pole _Bcc"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Pole _Cc"
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-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
+#: 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:1 ui/evolution.xml.h:1
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "Pomo_c"
 
@@ -11665,83 +12661,83 @@ msgstr "Pomo_c"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaje folder do listy zasubskrybowanych folderСw"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Folder"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Od╤wie© listЙ"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Od╤wie©a listЙ folderСw"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Usuwa folder z listy zasubskrybowanych folderСw"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Zapisz"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Wypisz"
 
 #: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Assign Task"
+msgstr "Przyporz╠dkowany"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Anuluj zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
-msgid "Delegate Task"
-msgstr "Oddeleguj zadanie"
+#: ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Cancel this task"
+msgstr "Anuluj zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Obtain the latest task information"
+msgstr "Pobiera naj╤wie©sze informacje o spotkaniu"
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "_Od╤wie© zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:2
 msgid "Configure the task view's settings"
 msgstr "Konfiguruje ustawienia widoku zadania"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "Kopiuje zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
-msgid "Create a new task"
-msgstr "Tworzy nowe zadanie"
-
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "Wycina zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "Usuwa zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
-msgid "New Task"
-msgstr "Nowe zadanie"
-
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Wkleja zadanie ze schowka"
 
-#: ui/evolution-tasks.xml.h:1
-msgid "Save task as something else"
-msgstr "Zapisuje zadanie w innej formie"
-
-#: ui/evolution-tasks.xml.h:1
-msgid "Tasks Settings"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings..."
 msgstr "Ustawienia zadaЯ"
 
-#: ui/evolution-tasks.xml.h:1
-msgid "_Print Task..."
-msgstr "Wy_drukuj zadanie..."
-
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_Zadanie"
 
@@ -11749,152 +12745,153 @@ 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:10
 msgid "Delete this folder"
 msgstr "Usuwa folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Wy╤wietla inny folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "_ZakoЯcz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr "_NajczЙ╤ciej zadawane pytania"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "_Okno Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "KoЯczy pracЙ programu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Importuje zewnЙtrzny plik w wybranym formacie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "Przenosi folder w inne miejsce"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "OtwСrz w nowym _oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Otwiera folder w nowym oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Wy╤wietla informacje o Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Wy╤lij zgЁoszenie bЁЙdu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "Wy╤lij zgЁoszenie _bЁЙdu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
 msgstr "WysyЁa zgЁoszenie bЁЙdu za pomoc╠ Bug Buddy"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "PrzeЁ╠cz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:27
 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:28
 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:29
 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:30
 msgid "View the selected folder"
 msgstr "Wy╤wietla zaznaczony folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Informacje o Evolution..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "Pasek f_olderСw"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Przejd╪ do folderu..."
 
-#: ui/evolution.xml.h:1
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "Za_importuj plik..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_Przenie╤..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nowy"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Nowy folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_ZmieЯ nazwЙ..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_SkrСt"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Pasek _skrСtСw"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "Praca _bez podЁ╠czenia"
 
@@ -11902,19 +12899,19 @@ msgstr "Praca _bez podЁ╠czenia"
 msgid "Change the settings for the summary"
 msgstr "Zmienia ustawienia zestawienia"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:4
 msgid "Print summary"
 msgstr "Wydrukuj zestawienie"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:5
 msgid "Reload"
 msgstr "Od╤wie©"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:6
 msgid "Reload the view"
 msgstr "Od╤wie©a widok"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:8
 msgid "_Summary Settings..."
 msgstr "_Ustawienia zestawienia..."
 
@@ -11922,11 +12919,11 @@ msgstr "_Ustawienia zestawienia..."
 msgid "Address Cards"
 msgstr "Karty adresowe"
 
-#: views/addressbook/galview.xml.h:1
+#: views/addressbook/galview.xml.h:2
 msgid "By Company"
 msgstr "WedЁug firmy"
 
-#: views/addressbook/galview.xml.h:1
+#: views/addressbook/galview.xml.h:3
 msgid "Phone List"
 msgstr "Lista telefonСw"
 
@@ -11934,252 +12931,274 @@ 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"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "WybСr strefy czasowej"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "WybСr:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Strefy czasowe"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h: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 ""
+"Za pomoc╠ lewego przycisku myszy mo©esz powiЙkszyФ fragment mapy i wybraФ "
+"strefЙ czasow╠.\n"
+"Przyci╤niЙcie prawego przycisku przywraca zwykЁe powiЙkszenie."
+
 #. 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
+#: 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 "_Uaktualnij informacjЙ o zajЙto╤ci"
 
-#: 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:260
 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:1071
 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:433
 msgid "Now"
 msgstr "Teraz"
 
-#: widgets/misc/e-cell-date-edit.c:1 widgets/misc/e-dateedit.c:1
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Dzi╤"
 
-#: widgets/misc/e-cell-date-edit.c:1
+#: widgets/misc/e-cell-date-edit.c:732
 #, 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:158
 msgid "Search Editor"
 msgstr "Edytor wyszukiwaЯ"
 
-#: widgets/misc/e-filter-bar.c:1
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Zapisz wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:94
 msgid "Add to Saved Searches"
 msgstr "Dodaj do zapisanych wyszukiwaЯ"
 
-#: widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:95
 msgid "Clear"
 msgstr "Wyczy╤Ф"
 
-#: widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Wy╤wietl wszystkie"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informacje"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "BЁ╠d"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Pytanie"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "List"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "Bez wy╤wietlania tego komunikatu w przyszЁo╤ci."
 
-#: widgets/misc/e-search-bar.c:1
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_Wyszukiwanie"
 
-#: widgets/misc/e-search-bar.c:1
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Znajd╪"
 
@@ -12187,18 +13206,147 @@ msgstr "Znajd╪"
 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 "RDF Summary"
+#~ msgstr "Zestawienie RDF"
+
+#~ msgid "Name"
+#~ msgstr "Nazwa"
+
+#~ msgid "Family Name"
+#~ msgstr "Nazwisko panieЯskie"
+
+#~ msgid "Prim"
+#~ msgstr "GЁw"
+
+#~ msgid "Bus"
+#~ msgstr "Prc"
+
+#~ msgid "Comp"
+#~ msgstr "Frma"
+
+#~ msgid "Org"
+#~ msgstr "Org"
+
+#~ msgid "Bus Fax"
+#~ msgstr "Faks sЁu©b"
+
+#~ msgid "Bus 2"
+#~ msgstr "Prc 2"
+
+#~ msgid "Url"
+#~ msgstr "Url"
+
+#~ msgid "Dep"
+#~ msgstr "Oddz"
+
+#~ msgid "Off"
+#~ msgstr "Bro"
+
+#~ msgid "Prof"
+#~ msgstr "Zawd"
+
+#~ msgid "Man"
+#~ msgstr "Mnd©"
+
+#~ msgid "Ass"
+#~ msgstr "Asyst"
+
+#~ msgid "Nick"
+#~ msgstr "Przyd"
+
+#~ msgid "FBUrl"
+#~ msgstr "UrlZaj"
+
+#~ msgid "Anniversary"
+#~ msgstr "Rocznica"
+
+#~ msgid "Anniv"
+#~ msgstr "Roczn"
+
+#~ msgid "Birth Date"
+#~ msgstr "Data urodzenia"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Czy na pewno chcesz\n"
+#~ "usun╠Ф ten kontakt?"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#~ msgid "Send contact to other"
+#~ msgstr "Wy╤lij kontakt do innej osoby"
+
+#~ msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#~ msgstr ""
+#~ ",123,a,╠,b,c,Ф,d,e,Й,f,g,h,i,j,k,l,Ё,m,n,Я,o,С,p,q,r,s,╤,t,u,v,w,x,y,z,╪,©"
+
+#~ msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#~ msgstr ""
+#~ ",0,a,╠,b,c,Ф,d,e,Й,f,g,h,i,j,k,l,Ё,m,n,Я,o,С,p,q,r,s,╤,t,u,v,w,x,y,z,╪,©"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Kliknij, aby dodaФ uczestnika"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Edit"
+#~ msgstr "Edycja"
+
+#~ msgid "ENBR:EGAC:EGAA"
+#~ msgstr "EPWA:EPKK:EPPO:EPSC"
+
+#~ msgid "New contact"
+#~ msgstr "Nowy Kontakt"
+
+#~ msgid "Send _contact to other"
+#~ msgstr "Wy╤lij _kontakt do innej osoby"
+
+#~ msgid "Send _message to contact"
+#~ msgstr "Wy╤lij _list do kontaktu"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Zamyka termin"
+
+#~ msgid "Print S_etup"
+#~ msgstr "U_stawienia wydruku"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Zapisuje termin i zamyka okno"
+
+#~ msgid "Help"
+#~ msgstr "Pomoc"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "_Wy╤lij kontakt do innej osoby..."
+
+#~ msgid "See online help"
+#~ msgstr "Wy╤wietla pomoc"
+
+#~ msgid "Delegate Task"
+#~ msgstr "Oddeleguj zadanie"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Zapisuje zadanie w innej formie"
+
+#~ msgid "_Print Task..."
+#~ msgstr "Wy_drukuj zadanie..."
diff --git a/po/pt.po b/po/pt.po
index 47cde15dd0..1043d8d7cd 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Tiago AntЦo <tiagoantao@bigfoot.com>, 2000.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -21,202 +22,202 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 #, fuzzy
 msgid "Card: "
 msgstr "Carro"
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nome"
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "EndereГo"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -232,13 +233,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -257,8 +258,8 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -273,21 +274,21 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -340,220 +341,218 @@ msgstr "NЦo consigo inicializar o componente de mail do Evolution."
 msgid "Factory for the sample Addressbook control"
 msgstr "Pressione aqui para o livro de endereГos"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
 #, fuzzy
-msgid "LDAP Server"
-msgstr "Servidor:"
+msgid "Contacts"
+msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-config.c:150
+#: addressbook/gui/component/addressbook-component.c:68
 #, fuzzy
-msgid "File"
-msgstr "_Pasta"
+msgid "Folder containing contact information"
+msgstr "Uma pasta contendo entradas de calendАrio"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
 #, 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 ""
+msgid "New Contact"
+msgstr "_Contacto"
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:386
 #, fuzzy
-msgid "Password"
-msgstr "Esquecer _Senhas"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr ""
+msgid "New _Contact"
+msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-config.c:177
+#: addressbook/gui/component/addressbook-component.c:387
 #, fuzzy
-msgid "Base"
-msgstr "Colar"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr ""
+msgid "New Contact List"
+msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-component.c:387
 #, fuzzy
-msgid "Subtree"
-msgstr "Fontes"
+msgid "New Contact _List"
+msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "мcone_s pequenos"
 
-#. 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.glade.h:3
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
+#: addressbook/gui/component/addressbook-config.glade.h:4
 #, fuzzy
-msgid "Host:"
-msgstr "Horas"
+msgid "Addressbook Sources"
+msgstr "Adicionar Fonte"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Adicionar..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#, fuzzy
+msgid "Base"
+msgstr "Colar"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Colar"
 
-#: addressbook/gui/component/addressbook-config.c:411
+#: addressbook/gui/component/addressbook-config.glade.h:8
 #, fuzzy
-msgid "Port:"
-msgstr "Prioridade:"
+msgid "De_lete"
+msgstr "Apagar"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:432
+#: addressbook/gui/component/addressbook-config.glade.h:10
 #, fuzzy
-msgid "Search Scope:"
+msgid "Search _base:"
 msgstr "Ano"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "AutenticaГЦo"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Ano"
 
-#: addressbook/gui/component/addressbook-config.c:501
+#: addressbook/gui/component/addressbook-config.glade.h:12
 #, fuzzy
-msgid "Advanced LDAP Options"
-msgstr "Encontrar avanГado"
+msgid "Server Name"
+msgstr "_Items seleccionados"
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
-msgstr "Caminho"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Do"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
 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
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Adicionar Fonte"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
-msgid "De_lete"
-msgstr "Apagar"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, fuzzy
-msgid "Name"
-msgstr "Nome"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
-msgstr ""
+msgid "_Account name:"
+msgstr "мcone_s pequenos"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "_Add"
 msgstr "Adicionar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_Edit"
 msgstr "Editar..."
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid "_My server requires authentication"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Prioridade:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Encontrar mensagens"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 #, fuzzy
 msgid "Other Contacts"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook.c:345
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
-msgid "Enter password for %s"
+msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "AutenticaГЦo"
+
+#: addressbook/gui/component/addressbook.c:405
+#, fuzzy
+msgid "Email Address:"
+msgstr "EndereГo de correio:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Esquecer _Senhas"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -561,50 +560,75 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 #, fuzzy
 msgid "Any field contains"
 msgstr "Uma pasta contendo tarefas"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 #, fuzzy
 msgid "Email contains"
 msgstr "мcone_s pequenos"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
+msgid "Category is"
 msgstr "мcone_s pequenos"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+#, fuzzy
+msgid "Advanced..."
+msgstr "Adicionar..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+msgid "Any Category"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que o navegador de pastas mostrarА"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "Nome"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "Correio electrСnico 3"
 
@@ -628,20 +652,20 @@ msgstr ""
 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-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "EndereГo de correio:"
@@ -663,13 +687,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Remover"
 
@@ -683,39 +704,56 @@ msgstr "Remover"
 msgid "Send HTML Mail?"
 msgstr "Enviar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
-msgid "Message Recipients"
-msgstr "SituaГЦo das mensagens"
+msgid "C_ontaining:"
+msgstr "_AcГУes"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
-msgid "Select Names"
-msgstr "_Items seleccionados"
+msgid "Co_ntacts:"
+msgstr "_Contacto"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "_Items seleccionados"
+msgid "F_ind"
+msgstr "Encontrar"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "Select Names"
+msgstr "_Items seleccionados"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
-msgid "_Search"
-msgstr "Ano"
+msgid "_Folder:"
+msgstr "_Pasta"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "SituaГЦo das mensagens"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -730,8 +768,8 @@ 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -741,16 +779,16 @@ msgid "Contact Editor"
 msgstr "_Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
-msgstr ""
+#, fuzzy
+msgid "File A_s:"
+msgstr "_Pasta"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr ""
 
@@ -776,256 +814,1245 @@ msgstr ""
 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #, fuzzy
 msgid "_Address..."
 msgstr "EndereГo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "_Contacts..."
 msgstr "_Contacto"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Delete"
 msgstr "Apagar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "_Full Name..."
 msgstr "Nome completo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Home"
 msgstr "Casa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "_Mobile"
 msgstr "TelemСvel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr ""
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "EndereГo de correio:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "Apagar um contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Carro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "RDIS"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "TelemСvel"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Bip"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "PrimАrio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Criar um novo calendАrio"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 #, fuzzy
 msgid "Edit Full"
 msgstr "_Pastas"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 #, fuzzy
 msgid "Full Name"
 msgstr "Nome completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 #, fuzzy
 msgid "E-mail"
 msgstr "Correio electrСnico 2"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #, fuzzy
 msgid "Address _2:"
 msgstr "EndereГo"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Afghanistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "Antarctica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "OrganizaГЦo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+msgid "Austria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "Ano"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Tamanho"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Enviar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "_Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 #, fuzzy
 msgid "Canada"
 msgstr "Novo Ca_lendАrio"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Carro"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 #, fuzzy
 msgid "Check Address"
 msgstr "EndereГo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "_Pasta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Carro"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Cores"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Copiar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 #, fuzzy
 msgid "Finland"
 msgstr "Encontrar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+msgid "France"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+#, fuzzy
+msgid "Germany"
+msgstr "Dia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "Semana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Encontrar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Novo Ca_lendАrio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+msgid "Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "_Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "Horas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Domingo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+#, fuzzy
+msgid "Italy"
+msgstr "Hoje"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+msgid "Laos"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+msgid "Lesotho"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "_Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Ano"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "_Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "_Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "_Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "мcones _grandes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Segunda-feira"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Segunda-feira"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "TelemСvel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Bip"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Responder"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Reponder para todos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "_Contacto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "CabeГalhos:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "_Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "Minuto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Novo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Colar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Novo Ca_lendАrio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Bip"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Encontrar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Prioridade"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "Data"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Segundos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Novo Ca_lendАrio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Fontes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Enviar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+msgid "Seychelles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "F_ormato"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Enviar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Dom"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Encontrar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Enviar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+msgid "Taiwan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Lista de tarefas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Encontrar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Para:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Hoje"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Ter"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+msgid "Turkmenistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Novo Ca_lendАrio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Encontrar mensagens"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "_Items seleccionados"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Enviar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 #, fuzzy
 msgid "_Address:"
 msgstr "EndereГo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 #, fuzzy
 msgid "_City:"
 msgstr "Prioridade:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr ""
 
@@ -1118,6 +2145,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Remover"
@@ -1128,7 +2156,7 @@ msgid "contact-list-editor"
 msgstr "_Contacto"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "_Contacto"
@@ -1138,7 +2166,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1160,25 +2188,32 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "_Novo Contacto"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
+#: widgets/misc/e-filter-bar.c:243
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Adicionar..."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 #, fuzzy
 msgid "Search"
 msgstr "Ano"
@@ -1303,44 +2338,54 @@ msgstr ""
 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 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:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_Abrir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Send message to contact"
+msgid "Forward Contact"
+msgstr "Enviar esta mensagem"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "Enviar mensagem em formato HTML"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimir..."
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Apagar"
 
@@ -1356,7 +2401,8 @@ 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
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr ""
 
@@ -1364,7 +2410,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr ""
 
@@ -1382,9 +2428,12 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
-msgstr "Novo Ca_lendАrio"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
+msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #, fuzzy
@@ -1411,151 +2460,151 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 #, fuzzy
 msgid "File As"
 msgstr "_Pasta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 #, fuzzy
 msgid "Email"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 #, fuzzy
 msgid "Primary Phone"
 msgstr "PrimАrio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 #, fuzzy
 msgid "Home Phone"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "OrganizaГЦo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 #, fuzzy
 msgid "Business Address"
 msgstr "EndereГo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 #, fuzzy
 msgid "Home Address"
 msgstr "EndereГo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "TelemСvel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Other Phone"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Other Address"
 msgstr "EndereГo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 #, fuzzy
 msgid "Department"
 msgstr "Data"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 #, fuzzy
 msgid "Office"
 msgstr "Fora do escritСrio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 #, fuzzy
 msgid "Title"
 msgstr "_Pasta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 #, fuzzy
 msgid "Manager"
 msgstr "Bip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 #, fuzzy
 msgid "Nickname"
 msgstr "Nome"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 #, fuzzy
 msgid "Spouse"
 msgstr "Fontes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "Note"
 msgstr "Nenhuma"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Nenhuma"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr ""
 
@@ -1774,6 +2823,23 @@ msgstr ""
 msgid "_Font..."
 msgstr "Imprimir..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Imprimir calendАrio"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Imprimir calendАrio"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Imprimir..."
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1936,7 +3002,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "NЦo se consegui inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "NЦo se consegui inicializar Bonobo"
@@ -1945,156 +3011,145 @@ msgstr "NЦo se consegui inicializar Bonobo"
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
+#: calendar/gui/calendar-commands.c:435
+#, c-format
+msgid "%d"
 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"
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+msgid "%d %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:586
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:604
 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/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr ""
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr ""
 
-#: 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"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 #, fuzzy
 msgid "S"
 msgstr "Do"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 #, fuzzy
 msgid "W"
 msgstr "Qa"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 #, 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 #, 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 #, fuzzy
 msgid "Low"
 msgstr "Novo"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
 #, fuzzy
-msgid "Transparent"
-msgstr "Transportes"
+msgid "Free"
+msgstr "Semana"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Ocupado"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 #, 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 #, 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2102,69 +3157,56 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr ""
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Nenhuma"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 #, fuzzy
 msgid "No"
 msgstr "Novo"
@@ -2189,28 +3231,92 @@ msgstr "Semana"
 msgid "Month View"
 msgstr "MЙs"
 
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Summary contains"
+msgstr "мcone_s pequenos"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "Nenhuma descriГЦo"
+
+#: calendar/gui/cal-search-bar.c:58
+#, fuzzy
+msgid "Comment contains"
+msgstr "Assunto"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+#, fuzzy
+msgid "Calendar"
+msgstr "Novo Ca_lendАrio"
+
+#: calendar/gui/component-factory.c:55
+#, fuzzy
+msgid "Folder containing appointments and events"
+msgstr "Uma pasta contendo entradas de calendАrio"
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "Tasks"
+msgstr "_Tarefa"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Uma pasta contendo entradas de calendАrio"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso para hoje"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Create a new task"
+msgstr "Criar um novo contacto"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "_Tarefa"
+
 #: 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
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "SituaГЦo das mensagens"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2263,122 +3369,128 @@ msgstr "Horas"
 msgid "minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "DiasRascunhos"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr "Hoje"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "Semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr "Semana"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr "Hora"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "SumАrio:"
@@ -2388,13 +3500,12 @@ msgstr "SumАrio:"
 msgid "_Options..."
 msgstr "_OpГУes"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "after"
 msgstr "Data"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr ""
 
@@ -2414,7 +3525,7 @@ msgstr "_Editar Compromisso"
 msgid "hour(s)"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 #, fuzzy
 msgid "minute(s)"
 msgstr "Minutos"
@@ -2436,212 +3547,226 @@ msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 #, fuzzy
-msgid "12 hour (am/pm)"
-msgstr "12 horas (AM/PM)"
+msgid "15 minutes"
+msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 #, fuzzy
-msgid "15 minutes"
+msgid "30 minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 #, fuzzy
-msgid "24 hour"
-msgstr "24 horas"
+msgid "60 minutes"
+msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
-msgid "30 minutes"
-msgstr "Minutos"
+msgid "Calendar and Tasks Settings"
+msgstr "PreferЙncias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
-msgid "60 minutes"
-msgstr "Minutos"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
+msgid "Color for tasks due today"
 msgstr ""
 
 #: 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"
+msgid "Create new appointments with a default _reminder"
+msgstr "Criar um novo compromisso para hoje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
-msgid "Calendar Preferences"
-msgstr "PreferЙncias"
+msgid "Days"
+msgstr "5 Dias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
+msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+#, fuzzy
+msgid "Friday"
+msgstr "Sex"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+msgid "Hours"
+msgstr "Horas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
-msgstr ""
+msgid "Minutes"
+msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Segunda-feira"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "Defaults"
-msgstr "Apagar"
+msgid "O_verdue tasks:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 #, fuzzy
-msgid "Display"
-msgstr "Dia"
+msgid "Saturday"
+msgstr "Domingo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
+msgid "Show appointment _end times in week and month views"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr ""
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Mostrar 1 semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Sex"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "Hora de Мn_icio de encontro"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
-msgid "Friday"
-msgstr "Sex"
+msgid "Su_n"
+msgstr "Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Domingo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "Seg"
+#, fuzzy
+msgid "T_hu"
+msgstr "Qui"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Segunda-feira"
+#, fuzzy
+msgid "T_ue"
+msgstr "Ter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
+msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:968
+#, fuzzy
+msgid "Thursday"
+msgstr "Hoje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 #, fuzzy
-msgid "Remind me of all appointments"
-msgstr "Compromisso - %s"
+msgid "Time"
+msgstr "_Pasta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr "Nome completo:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "SАb"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Nenhuma descriГЦo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-#, fuzzy
-msgid "Saturday"
-msgstr "Domingo"
+msgid "Time format:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Show appointment end times in week and month views"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:966
+#, fuzzy
+msgid "Tuesday"
+msgstr "Hoje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#, fuzzy
-msgid "Show week numbers"
-msgstr "Mostrar 1 semana"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
-msgid "Start of day:"
-msgstr "Hora de Мn_icio de encontro"
+msgid "Work Week"
+msgstr "Semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "Dom"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 horas (AM/PM)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Domingo"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 horas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "Lista de tarefas"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "Qui"
+#, fuzzy
+msgid "_Display"
+msgstr "Dia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
 #, fuzzy
-msgid "Thursday"
-msgstr "Hoje"
+msgid "_End of day:"
+msgstr "Hora de Мn_icio de encontro"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "_Pasta"
+msgid "_Fri"
+msgstr "Sex"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
+msgid "_General"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr ""
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Imprimir a mensagem seleccionada"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr "Nome completo:"
+msgid "_Mon"
+msgstr "Seg"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "Ter"
+#, fuzzy
+msgid "_Other"
+msgstr "Outro"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
 #, fuzzy
-msgid "Tuesday"
-msgstr "Hoje"
+msgid "_Sat"
+msgstr "SАb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "Qua"
+#, fuzzy
+msgid "_Task List"
+msgstr "Lista de tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr ""
+#, fuzzy
+msgid "_Wed"
+msgstr "Qua"
 
 #: 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 ""
+msgid "before the start of the appointment"
+msgstr "Novo compromisso"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2703,73 +3828,68 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "_Entrada diАria?"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Nenhum sumАrio"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2815,44 +3935,38 @@ msgstr ""
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "_Items seleccionados"
+msgid "Addressbook..."
+msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "Segundos"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr ""
+msgid "Delegate To:"
+msgstr "Apagar"
 
-#: 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/e-delegate-dialog.glade.h:3
+#, fuzzy
+msgid "Enter Delegate"
+msgstr "Apagar"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 #, fuzzy
 msgid "Appointment"
 msgstr "Compromissos:"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 #, fuzzy
 msgid "Reminder"
 msgstr "Enviar"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 #, fuzzy
 msgid "Recurrence"
 msgstr "Apagar todas as ocurrЙncias"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "Seg"
@@ -2861,174 +3975,189 @@ msgstr "Seg"
 msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Ocupado"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+msgid "Con_fidential"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Date & Time"
 msgstr "Data"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "Semana"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
 msgid "Pri_vate"
 msgstr "Activar"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Horas"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 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
+#: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
 msgid "_End time:"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 #, fuzzy
 msgid "_Start time:"
 msgstr "Hora de Мn_icio de encontro"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, fuzzy
 msgid "Declined"
 msgstr "Receber"
 
-#: calendar/gui/dialogs/meeting-page.c:644
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Apagar"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "In Process"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 msgid "Sent By:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Apagar"
@@ -3070,20 +4199,19 @@ 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
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
 msgid "Organizer:"
@@ -3130,15 +4258,15 @@ msgstr "MЙs"
 msgid "th"
 msgstr "h"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 #, fuzzy
 msgid "occurrences"
 msgstr "Apagar todas as ocurrЙncias"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Custom recurrence"
-msgstr "Apagar todas as ocurrЙncias"
+msgid "A_dd"
+msgstr "Adicionar"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3151,28 +4279,34 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 #, fuzzy
 msgid "Recurrence Rule"
 msgstr "Apagar todas as ocurrЙncias"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr ""
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Apagar todas as ocurrЙncias"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Segunda-feira"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Apagar todas as ocurrЙncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Apagar todas as ocurrЙncias"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 #, fuzzy
 msgid "for"
@@ -3219,174 +4353,169 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "Date Completed:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 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"
+msgid "Date Completed:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #, fuzzy
-msgid "No one"
-msgstr "Nenhuma"
+msgid "Progress"
+msgstr "Propriedades do alarme"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:130
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #, fuzzy
-msgid "Task"
-msgstr "_Tarefa"
+msgid "_Priority:"
+msgstr "Prioridade:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Status:"
+msgstr "SАb"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
 #, fuzzy
-msgid "Progress"
-msgstr "Propriedades do alarme"
+msgid "Assignment"
+msgstr "Compromissos:"
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+#, fuzzy
+msgid "Description:"
+msgstr "Nenhuma descriГЦo"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "Hora de Мn_icio de encontro"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
-msgid "_Due Date:"
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
 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/dialogs/task-page.glade.h:11
+msgid "_Due Date:"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 #, 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "_Copy"
 msgstr "Copiar"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "_Paste"
 msgstr "Colar"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-calendar-table.c:1137
+#: calendar/gui/e-calendar-table.c:1130
 #, fuzzy
-msgid "Click here to add a task"
+msgid "Click 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"
@@ -3423,26 +4552,25 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Start Date"
 msgstr "Hora de Мn_icio de encontro"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 #, fuzzy
 msgid "Summary"
 msgstr "SumАrio"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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 ""
@@ -3454,153 +4582,259 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3306
-#, fuzzy
-msgid "New _Appointment"
-msgstr "Novo compromisso"
-
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Hoje"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Ir para a _pasta..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Apagar esta ocurrЙncia"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta ocurrЙncia"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Apagar todas as ocurrЙncias"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
-msgid "This is a meeting request."
+#: calendar/gui/e-itip-control.c:618
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Nenhuma InformaГЦo"
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Seg"
+
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Hora de _fim de _encontro"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "Pedido de _encontro"
+
+#: calendar/gui/e-itip-control.c:637
+#, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Seg"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:643
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Ficheiro nЦo encontrado"
+msgid "Meeting Cancellation"
+msgstr "Apagar um contacto"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
-msgid "This is a task request."
-msgstr "_Pedido de tarefa"
+msgid "Bad Meeting Message"
+msgstr "Mensagens enviadas"
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Nenhuma InformaГЦo"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "_Tarefa"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "_Pedido de tarefa"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Responder"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:691
+msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Novo Ca_lendАrio"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Nenhuma InformaГЦo"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Nenhuma InformaГЦo"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Encontrar mensagens"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+msgid "Update complete\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "Cores"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Data"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3643,44 +4877,27 @@ msgstr ""
 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
+#: calendar/gui/e-tasks.c:349
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Criar um novo calendАrio"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, 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/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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Novo compromisso"
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Criar um novo calendАrio"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3708,46 +4925,46 @@ msgid "Go To Date"
 msgstr "Hoje"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "Go To Today"
+msgstr "Hoje"
+
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "March"
 msgstr "Ano"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
 msgid "May"
 msgstr "Segunda-feira"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 #, fuzzy
 msgid "October"
 msgstr "Outro"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "Hoje"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3903,13 +5120,6 @@ msgstr "Sx"
 msgid "Sa"
 msgstr "SА"
 
-#: 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:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3945,9 +5155,8 @@ msgid "Print Calendar"
 msgstr "Imprimir calendАrio"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Prever impressЦo"
 
@@ -3961,7 +5170,7 @@ msgstr "Imprimir este item"
 msgid "Print Setup"
 msgstr "Imprimir..."
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "O URI que o calendАrio mostrarА"
@@ -3998,6 +5207,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 ""
@@ -4058,7 +5363,7 @@ msgid "Unable to process spool folder"
 msgstr "ImpossМvel abrir o livro de endereГos"
 
 #: camel/camel-filter-driver.c:667
-#, fuzzy
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Enviar esta mensagem"
 
@@ -4097,7 +5402,7 @@ msgstr "Erro a gravar os atalhos."
 msgid "Error executing filter: %s: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro a gravar os atalhos."
@@ -4120,12 +5425,12 @@ msgstr "Erro a gravar os atalhos."
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -4239,13 +5544,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -4263,15 +5568,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr "Criar um novo calendАrio"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4305,7 +5610,7 @@ msgid "Connection cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4316,7 +5621,7 @@ msgstr ""
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir calendАrio"
@@ -4436,42 +5741,70 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "AutenticaГЦo"
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Password"
+msgstr "Esquecer _Senhas"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Fontes"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4484,12 +5817,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4534,7 +5867,7 @@ msgstr "Anexar um ficheiro Ю mensagem"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4542,7 +5875,7 @@ msgid ""
 msgstr "Assunto"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4583,61 +5916,61 @@ msgstr "Enviar a mensagem"
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, 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:1491
 #: 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
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Encontrar mensagens"
@@ -4651,7 +5984,7 @@ msgstr ""
 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
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Verificar novo correio"
@@ -4661,7 +5994,7 @@ msgstr "Verificar novo correio"
 msgid "Check for new messages in all folders"
 msgstr "Verificar novo correio"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "_Pastas"
 
@@ -4700,7 +6033,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "AutenticaГЦo"
@@ -4711,7 +6044,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -4723,12 +6056,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4818,7 +6151,7 @@ msgstr ""
 #: 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-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4830,7 +6163,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
@@ -4898,20 +6231,20 @@ msgstr "NЦo consigo abrir a localizaГЦo: %s"
 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-mbox-folder.c:209
 #: 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:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: 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-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4921,12 +6254,12 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
@@ -4969,13 +6302,13 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing 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"
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4985,26 +6318,23 @@ 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 ""
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
+msgstr "NЦo consigo abrir a localizaГЦo: %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:1516
+#: camel/providers/local/camel-spool-summary.c:931
 #, fuzzy
-msgid "Synchronising folder"
+msgid "Synchronizing 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 ""
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
+msgstr "Criar um novo calendАrio"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -5106,6 +6436,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5194,40 +6535,40 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, 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
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: 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
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Criar uma nova mensagem"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Enviar esta mensagem"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 #, fuzzy
 msgid "Message storage"
@@ -5243,7 +6584,7 @@ msgstr "Gravar a mensagem na pasta especificada"
 msgid "Delete after %s day(s)"
 msgstr "Apagar este item"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr ""
 
@@ -5322,7 +6663,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sendmail"
 msgstr "Enviar"
@@ -5376,7 +6717,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
@@ -5384,126 +6725,126 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Help message"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 #, fuzzy
 msgid "Service ready"
 msgstr "Servidor:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "AutenticaГЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 #, fuzzy
 msgid "Authentication required"
 msgstr "AutenticaГЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5511,127 +6852,127 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 #, fuzzy
 msgid "Sending message"
 msgstr "Mensagens enviadas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "AutenticaГЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5661,7 +7002,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 #, fuzzy
 msgid "attachment"
 msgstr "Anexo"
@@ -5697,14 +7038,14 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endereГos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 #, fuzzy
 msgid "From:"
 msgstr "De"
@@ -5712,7 +7053,7 @@ msgstr "De"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Responder"
@@ -5720,31 +7061,31 @@ msgstr "Responder"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endereГos que irЦo receber uma cСpia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5771,98 +7112,98 @@ msgid ""
 "%s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 #, fuzzy
 msgid "Save as..."
 msgstr "Gravar como VCard"
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Seg"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "_Inserir"
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Criar uma nova mensagem"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr ""
 
@@ -5892,55 +7233,101 @@ msgstr "EndereГo"
 msgid "calendar information"
 msgstr "Nenhuma InformaГЦo"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "_AcГУes"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "Ficheiro nЦo encontrado"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "Assunto"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "SituaГЦo das mensagens"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Assunto"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Assunto"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Assunto"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "Assunto"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr ""
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr ""
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr ""
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5948,13 +7335,13 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:303
+#: e-util/e-time-utils.c:313
 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
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
@@ -6054,7 +7441,7 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr ""
 
@@ -6066,11 +7453,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr ""
 
@@ -6091,21 +7482,21 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 #, fuzzy
 msgid "Select Folder"
 msgstr "_Nova pasta"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6126,63 +7517,52 @@ msgstr "Nome completo:"
 msgid "Untitled"
 msgstr "(Sem tМtulo)"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "_Pastas"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "_Pastas"
@@ -6208,211 +7588,212 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "Anexo"
 
-#: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "contains"
-msgstr "_AcГУes"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "Ir para a _pasta..."
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Date received"
 msgstr "Receber"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "Date sent"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Deleted"
 msgstr "Apagar"
 
-#: 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
-#, fuzzy
-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
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Draft"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "PrС_ximo"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 #, fuzzy
 msgid "Message Body"
 msgstr "SituaГЦo das mensagens"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 #, fuzzy
 msgid "Message Header"
 msgstr "SituaГЦo das mensagens"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Message was sent"
 msgstr "SituaГЦo das mensagens"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Ir para a _pasta..."
 
-#: 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
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Read"
 msgstr "Remover"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Replied to"
 msgstr "Reponder para todos"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 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
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 #, fuzzy
 msgid "Sender"
 msgstr "Enviar"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 #, fuzzy
 msgid "Set Status"
 msgstr "SituaГЦo online"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Tamanho"
 
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "Source Account"
+msgstr "мcone_s pequenos"
+
+#: filter/libfilter-i18n.h:30
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:32
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "Assunto"
+
+#: filter/libfilter-i18n.h:36
+#, fuzzy
+msgid "contains"
+msgstr "_AcГУes"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "does not sound like"
+msgstr "Ficheiro nЦo encontrado"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr ""
+
 #: filter/libfilter-i18n.h:45
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "Source Account"
-msgstr "мcone_s pequenos"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "starts with"
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:50
-msgid "Stop Processing"
+msgid "sounds like"
 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:51
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:52
 msgid "was after"
@@ -6447,14 +7828,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "_Correio"
@@ -6481,12 +7861,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "Segundos"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6547,186 +7927,205 @@ msgstr "NЦo consigo inicializar o componente de mail do Evolution."
 msgid "Mail configuration interface"
 msgstr "ConfiguraГЦo do correio"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Uma pasta contendo items de correio"
+
+#: mail/component-factory.c:114
 #, fuzzy
 msgid "This folder cannot contain messages."
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "Propriedades do alarme"
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propriedades"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Mensagem de _correio"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Mensagem de _correio"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "NЦo consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:893
+#: mail/folder-browser.c:909
 #, fuzzy
-msgid "Store search as vFolder"
-msgstr "_Nova pasta"
+msgid "Create vFolder from Search"
+msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Assunto"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Ficheiro nЦo encontrado"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "SituaГЦo das mensagens"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ficheiro nЦo encontrado"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Ficheiro nЦo encontrado"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Ficheiro nЦo encontrado"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1273
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "Resend"
-msgstr " segundos"
+msgid "_Edit as New Message..."
+msgstr "Encontrar mensagens"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Save As..."
 msgstr "Gravar na _pasta..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 #, fuzzy
 msgid "_Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 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
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Undelete"
 msgstr "Apagar"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Nenhuma InformaГЦo"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr ""
@@ -6791,58 +8190,63 @@ msgid "Evolution News Editor"
 msgstr "Atalho para _barra do Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 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
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 #, fuzzy
 msgid " (default)"
 msgstr "Apagar"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 #, fuzzy
 msgid "Disable"
 msgstr "Como _Tabela"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Apagar"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 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-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "ConfiguraГЦo do co_rreio..."
 
 #: mail/mail-autofilter.c:70
 #, fuzzy, c-format
@@ -6888,17 +8292,17 @@ msgid ""
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6906,207 +8310,236 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 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:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "SituaГЦo das mensagens"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+#, fuzzy
+msgid "Warning"
+msgstr "Seg"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "_Pasta"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "Atalho para _barra do Evolution"
+
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Correio novo"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr ""
-
-#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " color"
 msgstr "Cores"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "Account"
 msgstr "мcone_s pequenos"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account Information"
 msgstr "Nenhuma InformaГЦo"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Accounts"
 msgstr "мcone_s pequenos"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Authentication"
 msgstr "AutenticaГЦo"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 #, 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
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "Cores"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7116,309 +8549,380 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "De_fault"
 msgstr "Apagar"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Display"
+msgstr "Dia"
+
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Done"
 msgstr "Nenhuma"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 #, fuzzy
 msgid "Drafts"
 msgstr "Data"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 #, 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:30
+msgid "E_nable"
+msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:31
 #, fuzzy
-msgid "Email Address:"
-msgstr "EndereГo de correio:"
+msgid "Each account must have a different name."
+msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Imprimir..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
-#, fuzzy
-msgid "Full Name:"
-msgstr "Nome completo:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr ""
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "ConfiguraГЦo do correio"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "F_ormato"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
+#: mail/mail-config.glade.h:44
+msgid "Make this my _default account"
 msgstr ""
 
-#: 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"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "News"
 msgstr "Novo"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 #, 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
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Prompt when sending messages with an empty subject"
+#: mail/mail-config.glade.h:57
+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"
+#: mail/mail-config.glade.h:58
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "Nenhuma"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "Nenhuma InformaГЦo"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
-#, fuzzy
-msgid "Send mail in HTML format by default."
-msgstr "Enviar mensagem em formato HTML"
-
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Sending Email"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Sent"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Server Configuration"
 msgstr "ConfiguraГЦo do correio"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
-msgstr ""
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
+msgstr "AutenticaГЦo"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Nenhuma InformaГЦo"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "_Pastas"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
+#: mail/mail-config.glade.h:86
+msgid "Use secure connection (_SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:87
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "Verificar novo correio"
+
+#: mail/mail-config.glade.h:93
+msgid "_Check for supported types"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "EndereГo de correio:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Nome completo:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config.glade.h:100
+msgid "_Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "Horas"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
 #: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+msgid "_Log filter actions to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Utilizador:"
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "SituaГЦo das mensagens"
 
 #: mail/mail-config.glade.h:105
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
+#, fuzzy
+msgid "_Name:"
+msgstr "Nome"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "OrganizaГЦo:"
+
+#: mail/mail-config.glade.h:108
+msgid "_PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Caminho"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
 msgstr ""
 
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Mudar nome de atalho"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Enviar mensagem em formato HTML"
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Utilizador:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "seconds."
 msgstr " segundos"
@@ -7468,206 +8972,217 @@ msgstr "NЦo se consegui inicializar Bonobo"
 msgid "Could not create a S/MIME decode context."
 msgstr "NЦo se consegui inicializar Bonobo"
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Anexo"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 #, fuzzy
 msgid "Loading message content"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "еbrir em nova janela"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gravar na _pasta..."
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gravar como VCard"
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Apagar"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Adicionar anexo"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 #, fuzzy
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "EndereГo"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 #, fuzzy
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "Responder"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 #, fuzzy
 msgid "To"
 msgstr "Para:"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:330
 #, fuzzy, c-format
-msgid "Opening '%s'"
+msgid "No such folder /%s"
+msgstr "Enviar a mensagem"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, 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
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "_Nova pasta"
@@ -7686,217 +9201,237 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
+#: mail/mail-mt.c:796
 #, fuzzy
 msgid "Working"
 msgstr "Seg"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "_Nova pasta"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Enviar"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, 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
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 #, fuzzy
 msgid "Complete."
 msgstr "Cores"
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 #, fuzzy
 msgid "Moving"
 msgstr "Seg"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 #, fuzzy
 msgid "Copying"
 msgstr "Copiar"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 #, fuzzy
 msgid "Trash"
 msgstr "_Tarefa"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Abrir ficheiro"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Sincronizar"
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Anexo"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Criar um novo calendАrio"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Ano"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Sem tМtulo)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "Mensagem de _correio"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "Ano"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "Encontrar"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "Caminho"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:253
-#, fuzzy
-msgid "Receiving"
-msgstr "Receber"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:323
-#, fuzzy
-msgid "Sending"
-msgstr "Enviar"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Nenhuma InformaГЦo"
@@ -7916,89 +9451,95 @@ msgstr "Enviar esta mensagem"
 msgid "Forwarded message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 #, fuzzy
 msgid "VFolders"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 #, fuzzy
 msgid "New VFolder"
 msgstr "_Nova pasta"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Assunto"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "Mensagem de _correio"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 #, fuzzy
 msgid "Seen"
 msgstr "Enviar"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Criar uma nova mensagem"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Encontrar mensagens"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 #, fuzzy
 msgid "Higher"
 msgstr "CabeГalhos:"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 #, fuzzy
 msgid "Highest"
 msgstr "CabeГalhos:"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "Encontrar mensagens"
 
 #: mail/message-list.etspec.h:2
@@ -8015,41 +9556,79 @@ msgstr "Receber"
 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:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Encontrar mensagens"
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, c-format
-msgid "Getting store for \"%s\""
+msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abrir ficheiro"
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Folder"
+msgstr "_Pastas"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "SituaГЦo das mensagens"
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+msgid " _Refresh List "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "_Pastas"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Mostrar uma pasta diferente"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Nenhuma descriГЦo"
 
+#: mail/subscribe-dialog.glade.h:6
+#, fuzzy
+msgid "Show _folders from server: "
+msgstr "Motrar barra de _pastas"
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Fontes"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Fontes"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -8059,55 +9638,73 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr "NЦo consigo inicializar o componente de mail do Evolution."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 #, 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
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 #, fuzzy
 msgid "Appointments"
 msgstr "Compromissos:"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Compromisso - %s"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 msgid "%l:%M%p"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 msgid "%a %l:%M%p"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Nenhum sumАrio"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Adicionar novo grupo"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "InstalaГЦo do Evolution"
+msgid "Name:"
+msgstr "Nome"
+
+#: my-evolution/e-summary-preferences.c:1421
+#, fuzzy
+msgid "Summary Settings"
+msgstr "Segundos"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8117,7 +9714,12 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Servidor:"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Ver _anexos"
@@ -8126,26 +9728,31 @@ msgstr "Ver _anexos"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Segundos"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %Y"
 msgstr ""
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolution"
+msgid "Print Summary"
+msgstr "SumАrio"
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr ""
 
 #: my-evolution/main.c:52
@@ -8153,6 +9760,42 @@ msgstr ""
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Component de correio: NЦo consegui inicializar Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "MЙs"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Seg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Pasta"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Pasta"
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9325,121 +10968,138 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Adicionar novo grupo"
+msgid " _Remove"
+msgstr "Remover"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "_Pastas"
+msgid "Add n_ew feed"
+msgstr "Adicionar novo grupo"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "_AcГУes"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "_AcГУes"
+msgid "All _folders:"
+msgstr "_Pastas"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Mostrar uma pasta diferente"
+msgid "All news _feeds:"
+msgstr "Adicionar novo grupo"
 
 #: my-evolution/my-evolution.glade.h:7
-msgid "Display stations:"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "Dia"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "Sex"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "MЙs"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "Semana"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Ver _anexos"
 
 #: my-evolution/my-evolution.glade.h:14
 #, fuzzy
-msgid "News Feeds"
-msgstr "Servidor:"
+msgid "Show _today's tasks"
+msgstr "Ver _anexos"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "Segunda-feira"
+msgid "Tasks "
+msgstr "_Tarefa"
 
 #: my-evolution/my-evolution.glade.h:16
-#, fuzzy
-msgid "One month"
-msgstr "MЙs"
+msgid "Units: "
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-#, fuzzy
-msgid "One week"
-msgstr "Semana"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
+msgid "Weather settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Schedule"
-msgstr ""
+#, fuzzy
+msgid "_Display folders:"
+msgstr "Mostrar uma pasta diferente"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Ver _anexos"
+msgid "_Display stations:"
+msgstr "_AcГУes"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
-msgstr ""
+#, fuzzy
+msgid "_Displayed feeds:"
+msgstr "Dia"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Ver _anexos"
+msgid "_Five days"
+msgstr "Sex"
 
 #: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "Tasks "
-msgstr "_Tarefa"
+msgid "_Mail"
+msgstr "_Correio"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
-msgstr ""
+#, fuzzy
+msgid "_News Feeds"
+msgstr "Servidor:"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Outro"
+msgid "_One day"
+msgstr "Segunda-feira"
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "Weather settings"
+msgid "_Refresh time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "_Correio"
+msgid "_Schedule"
+msgstr "Fontes"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "Novas mensagens de correio"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "_Correio"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9456,7 +11116,17 @@ msgstr "Ver _anexos"
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "Correio novo"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "Correio novo"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "_Pastas"
@@ -9508,7 +11178,7 @@ msgid ""
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9516,7 +11186,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9525,7 +11195,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9533,53 +11203,75 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "_Nova pasta"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "Abrir ficheiro"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Nome completo:"
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nome completo:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
@@ -9591,7 +11283,7 @@ msgstr "Gravar a mensagem na pasta especificada"
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "O Evolution nЦo consegue criar as suas pastas locais"
@@ -9602,12 +11294,12 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 #, fuzzy
 msgid "New..."
 msgstr "Novo"
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Sem tМtulo)"
 
@@ -9637,7 +11329,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9682,7 +11374,7 @@ msgstr ""
 msgid "Filename:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 #, fuzzy
 msgid "Select a file"
 msgstr "Ficheiro com assinatura:"
@@ -9692,312 +11384,334 @@ msgstr "Ficheiro com assinatura:"
 msgid "File type:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "_Nova pasta"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 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:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "NЦo consegui correr o Bub buddy"
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 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:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, 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
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Work Offline"
 msgstr "Seg"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta mostrada)"
 
-#. 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
+#: shell/e-shell-view.c:1459
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1311
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:1644
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:1646
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:1648
+#, fuzzy
+msgid "Configuration Database not found"
+msgstr "ConfiguraГЦo do correio"
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:72
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 #, fuzzy
 msgid "Group name:"
 msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 #, fuzzy
 msgid "_Small Icons"
 msgstr "мcone_s pequenos"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 #, fuzzy
 msgid "_Large Icons"
 msgstr "мcones _grandes"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar atalhos co Мcones grandes"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 #, fuzzy
 msgid "_New Group..."
 msgstr "Novo grupo"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostrar barra de atalho_s"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New Window"
 msgstr "еbrir em nova janela"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 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:479
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts.c:984
-#, fuzzy
-msgid "Inbox"
-msgstr "Correio novo"
-
-#: shell/e-shortcuts.c:987
-#, fuzzy
-msgid "Contacts"
-msgstr "_Contacto"
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 #, fuzzy
 msgid "(No name)"
 msgstr "Nome"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr ""
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+msgid "The specified folder cannot be modified or removed"
+msgstr ""
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
@@ -10019,11 +11733,6 @@ msgstr "Horas"
 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:"
@@ -10040,18 +11749,27 @@ msgstr ""
 
 #: shell/importer/import.glade.h:2
 #, fuzzy
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr "Atalho para _barra do Evolution"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Utility"
+msgid "Evolution Importer Assistant"
 msgstr "Atalho para _barra do Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Ficheiro com assinatura:"
+
 #: 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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -10068,10 +11786,10 @@ msgid "Don't ask me again"
 msgstr ""
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10088,31 +11806,36 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "NЦo consigo inicializar o componente de mail do Evolution."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Falhou a inicializaГЦo do sistema de componentes Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Copiar"
 
@@ -10131,11 +11854,11 @@ msgstr "Criar um novo contacto"
 msgid "Create new contact list"
 msgstr "A sua lista de contactos"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Cortar"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr ""
 
@@ -10144,86 +11867,129 @@ msgstr ""
 msgid "Delete selected contacts"
 msgstr "Apagar um contacto"
 
-#: ui/evolution-addressbook.xml.h:10
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New contact"
-msgstr "Encontrar um contacto"
-
-#: ui/evolution-addressbook.xml.h:11
-#, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Novo"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Colar"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Colar item da Аrea de transferЙncia"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "Apagar um contacto"
+
+#: ui/evolution-addressbook.xml.h:21
 #, fuzzy
 msgid "Select All"
 msgstr "Reponder para todos"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Apagar um contacto"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Enviar mensagem em formato HTML"
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "Apagar um contacto"
+
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Enviar mensagem em formato HTML"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Stop"
 msgstr "Fontes"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "Stop Loading"
 msgstr "CabeГalhos:"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "_AcГУes"
+
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Adicionar Fonte"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Contacto"
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimir..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Gravar como VCard"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
+msgstr "_Novo Contacto"
+
+#: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -10233,124 +11999,138 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+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"
+msgid "Create a New _Task"
+msgstr "Criar um novo contacto"
 
 #: ui/evolution-calendar.xml.h:6
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "Criar um novo compromisso para hoje"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 #, 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
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Day"
+msgstr "DiasRascunhos"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Novo compromisso"
+
+#: ui/evolution-calendar.xml.h:13 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"
+#: ui/evolution-calendar.xml.h:14
+msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
-msgstr ""
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
+msgstr "Enviar esta mensagem"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to _Date"
 msgstr "Ir para"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Ir para uma data especМfica"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
-msgid "Go to present time"
-msgstr "Ir para o prСximo item"
+msgid "Go to today"
+msgstr "Hoje"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "MЙs"
+
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "New Appointment"
 msgstr "Novo compromisso"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+#, fuzzy
+msgid "New Task"
+msgstr "_Tarefa"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 #, fuzzy
-msgid "Print calendar"
-msgstr "Imprimir calendАrio"
+msgid "Print Pre_view"
+msgstr "Prever impressЦo"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Print this Calendar"
+msgid "Print this calendar"
 msgstr "Imprimir este calendАrio"
 
-#: ui/evolution-calendar.xml.h:22
-#, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "Nenhuma InformaГЦo"
-
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Mostrar 1 dia"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Mostrar 1 mЙs"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Mostrar 1 semana"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Mostrar a semana de trabalho"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
-msgid "W_ork Week"
+msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "_Novo compromisso..."
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "PreferЙncias"
 
-#: ui/evolution-calendar.xml.h:32
-#, fuzzy
-msgid "_Day"
-msgstr "DiasRascunhos"
-
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:41
 #, fuzzy
-msgid "_Month"
-msgstr "MЙs"
+msgid "_Publish Free/Busy Information"
+msgstr "Nenhuma InformaГЦo"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
-msgid "_Week"
-msgstr "Semana"
+msgid "_Task..."
+msgstr "_Tarefa"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10363,15 +12143,15 @@ msgstr "Cores"
 
 #: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
-msgid "Close this appointment"
-msgstr "Novo compromisso"
+msgid "Close this item"
+msgstr "Apagar este item"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr ""
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Apagar este item"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr ""
 
@@ -10380,122 +12160,88 @@ msgstr ""
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+#, fuzzy
+msgid "Save"
+msgstr "SА"
+
+#: ui/evolution-comp-editor.xml.h:14
 #, 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"
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 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 "_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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 #, 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.h:5
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Imprimir..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Gravar na _pasta..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:13
-#, 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-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "SА"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Apagar este item"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+#, fuzzy
+msgid "Delete..."
+msgstr "Apagar"
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "Enviar a mensagem"
@@ -10504,21 +12250,21 @@ msgstr "Enviar a mensagem"
 msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Imprimir calendАrio"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10530,15 +12276,10 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-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"
@@ -10555,70 +12296,66 @@ 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
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "Dias vazios:"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Esquecer _Senhas"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr ""
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Receber"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Show message preview window"
 msgstr "Se uma previsЦo da mensagem deve ser mostrada"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "_Pastas"
@@ -10648,99 +12385,109 @@ msgstr "Prever impressЦo"
 msgid "_Send / Receive"
 msgstr "Receber"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "Ir para a _pasta..."
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Cortar"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Novas mensagens de correio"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Colar item da Аrea de transferЙncia"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 #, fuzzy
 msgid "Select _All"
 msgstr "Reponder para todos"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
 msgid "Select _Thread"
 msgstr "Reponder para todos"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 #, fuzzy
-msgid "Show _All"
+msgid "Sh_ow Hidden Messages"
 msgstr "Novas mensagens de correio"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Enviar esta mensagem"
@@ -10749,7 +12496,7 @@ msgstr "Enviar esta mensagem"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Pasta"
 
@@ -10757,12 +12504,12 @@ msgstr "_Pasta"
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
 msgid "_Properties..."
 msgstr "Propriedades do alarme"
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Enviar esta mensagem"
@@ -11006,7 +12753,7 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:58
 #, fuzzy
-msgid "Previews the message to be printed"
+msgid "Preview the message to be printed"
 msgstr "Enviar a mensagem"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11029,43 +12776,37 @@ msgstr "Encontrar mensagens"
 msgid "Previous Unread Message"
 msgstr "Descartar esta mensagem?"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Encontrar mensagens"
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "Prever impressЦo"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Encontrar mensagens"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Responder"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Reponder para todos"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
@@ -11113,78 +12854,61 @@ msgstr ""
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "DruМda dos _filtros"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Dia"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "Mensagem de _correio"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Close"
 msgstr "Cores"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 #, fuzzy
 msgid "_View"
 msgstr "_Novo"
@@ -11254,12 +12978,6 @@ 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 "SА"
-
 #: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
@@ -11408,7 +13126,7 @@ msgstr "Responder"
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Help"
 msgstr "Casa"
@@ -11444,15 +13162,27 @@ msgid "Unsubscribe"
 msgstr ""
 
 #: ui/evolution-task-editor.xml.h:1
-msgid "Cancel Task"
+msgid "Assign Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
 msgstr ""
 
 #: ui/evolution-task-editor.xml.h:3
+msgid "Cancel Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
+msgid "Cancel this task"
 msgstr "Apagar este item"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr ""
 
@@ -11460,46 +13190,32 @@ msgstr ""
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Copiar item seleccionada para a Аrea de transferЙncia"
 
-#: ui/evolution-tasks.xml.h:4
-#, fuzzy
-msgid "Create a new task"
-msgstr "Criar um novo contacto"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Apagar este item"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "Apagar este item"
 
-#: ui/evolution-tasks.xml.h:8
-#, fuzzy
-msgid "New Task"
-msgstr "_Tarefa"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 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 "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "Segundos"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Task"
 msgstr "_Tarefa"
@@ -11538,200 +13254,173 @@ msgstr "Remover este atalho da barra de atalhos"
 msgid "Create a new folder"
 msgstr "Criar um novo calendАrio"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Apagar este item"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Mostrar uma pasta diferente"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 #, fuzzy
 msgid "E_xit"
 msgstr "PrС_ximo"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "_ComeГando"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "еbrir em nova janela"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostrar a barra de pastas"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:34
-#, fuzzy
-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
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:41
-#, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "_Compromisso"
-
-#: ui/evolution.xml.h:43
-#, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "_Contacto"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copiar"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Pasta"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:42
 #, fuzzy
-msgid "_Import file..."
+msgid "_Import File..."
 msgstr "Propriedades do alarme"
 
-#: ui/evolution.xml.h:53
-#, fuzzy
-msgid "_Index"
-msgstr "мnd_ice de ajuda"
-
-#: ui/evolution.xml.h:54
-#, fuzzy
-msgid "_Mail message"
-msgstr "Mensagem de _correio"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "Sg"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Abrir"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Mudar nome de atalho"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: ui/evolution.xml.h:61
-#, fuzzy
-msgid "_Task (FIXME)"
-msgstr "_Contacto"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Seg"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr ""
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
-msgstr "Evolution"
+msgid "Print summary"
+msgstr "Nenhum sumАrio"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Remover"
+
+#: ui/my-evolution.xml.h:6
+#, fuzzy
+msgid "Reload the view"
+msgstr "Encontrar mensagens"
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "ConfiguraГЦo do co_rreio..."
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
@@ -11771,6 +13460,27 @@ msgstr "Mensagem de _correio"
 msgid "With Category"
 msgstr ""
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "_Items seleccionados"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Segundos"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr ""
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11778,10 +13488,6 @@ msgstr ""
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Ocupado"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Fora do escritСrio"
@@ -11855,7 +13561,7 @@ msgstr ""
 msgid "_Current View"
 msgstr "Ano corrente (%Y)"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11865,20 +13571,21 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 #, fuzzy
 msgid "Now"
 msgstr "Novo"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Hoje"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -11963,40 +13670,35 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "_Contacto"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 #, fuzzy
 msgid "Save Search"
 msgstr "Ano"
 
-#: widgets/misc/e-filter-bar.c:241
+#: widgets/misc/e-filter-bar.h:94
 #, fuzzy
-msgid "Advanced Search"
-msgstr "Adicionar..."
+msgid "Add to Saved Searches"
+msgstr "Ano"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Carro"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:104
-#, fuzzy
-msgid "Advanced..."
-msgstr "Adicionar..."
-
 #: widgets/misc/e-messagebox.c:152
 #, fuzzy
 msgid "Information"
 msgstr "Nenhuma InformaГЦo"
 
-#: widgets/misc/e-messagebox.c:159
-#, fuzzy
-msgid "Warning"
-msgstr "Seg"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr ""
@@ -12017,10 +13719,15 @@ msgstr "Mensagem de _correio"
 msgid "Don't show this message again."
 msgstr "Enviar esta mensagem"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr ""
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "Encontrar"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -12046,6 +13753,194 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "NЦo se consegui inicializar Bonobo"
 
 #, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "SumАrio"
+
+#, fuzzy
+#~ msgid "LDAP Server"
+#~ msgstr "Servidor:"
+
+#, fuzzy
+#~ msgid "Unknown addressbook type"
+#~ msgstr "ImpossМvel abrir o livro de endereГos"
+
+#, fuzzy
+#~ msgid "Subtree"
+#~ msgstr "Fontes"
+
+#~ msgid "Authentication:"
+#~ msgstr "AutenticaГЦo"
+
+#, fuzzy
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "Encontrar avanГado"
+
+#, fuzzy
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "_Items seleccionados"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Novo Ca_lendАrio"
+
+#, fuzzy
+#~ msgid "Transparent"
+#~ msgstr "Transportes"
+
+#, fuzzy
+#~ msgid "Calendar Preferences"
+#~ msgstr "PreferЙncias"
+
+#, fuzzy
+#~ msgid "Defaults"
+#~ msgstr "Apagar"
+
+#, fuzzy
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Compromisso - %s"
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "_Items seleccionados"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Nenhuma"
+
+#, fuzzy
+#~ msgid "Task"
+#~ msgstr "_Tarefa"
+
+#, fuzzy
+#~ msgid "Transparency"
+#~ msgstr "Transportes"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Ficheiro nЦo encontrado"
+
+#, fuzzy
+#~ msgid "This is a task request."
+#~ msgstr "_Pedido de tarefa"
+
+#, fuzzy
+#~ msgid "Store search as vFolder"
+#~ msgstr "_Nova pasta"
+
+#, fuzzy
+#~ msgid "Resend"
+#~ msgstr " segundos"
+
+#, fuzzy
+#~ msgid "Receiving"
+#~ msgstr "Receber"
+
+#, fuzzy
+#~ msgid "Store"
+#~ msgstr "Fontes"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "InstalaГЦo do Evolution"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "New contact"
+#~ msgstr "Encontrar um contacto"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "_Contacto"
+
+#, fuzzy
+#~ msgid "Go to present time"
+#~ msgstr "Ir para o prСximo item"
+
+#, fuzzy
+#~ msgid "Print this Calendar"
+#~ msgstr "Imprimir este calendАrio"
+
+#, fuzzy
+#~ msgid "W_ork Week"
+#~ msgstr "Semana"
+
+#, fuzzy
+#~ msgid "Close this appointment"
+#~ msgstr "Novo compromisso"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "Imprimir..."
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "_AcГУes"
+
+#, fuzzy
+#~ msgid "Show _All"
+#~ msgstr "Novas mensagens de correio"
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "Prever impressЦo"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "Mensagem de _correio"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Apagar este item"
+
+#~ msgid "Getting _Started"
+#~ msgstr "_ComeГando"
+
+#, fuzzy
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Usando o programa de C_orreio"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Usando o _CalendАrio"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Usando o programa de C_orreio"
+
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Compromisso"
+
+#, fuzzy
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contacto"
+
+#, fuzzy
+#~ msgid "_Index"
+#~ msgstr "мnd_ice de ajuda"
+
+#, fuzzy
+#~ msgid "_Mail message"
+#~ msgstr "Mensagem de _correio"
+
+#, fuzzy
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Contacto"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Evolution"
+
+#, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "PreferЙncias"
 
@@ -12135,10 +14030,6 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgstr "Remover grupo"
 
 #, fuzzy
-#~ msgid "Subject contains"
-#~ msgstr "Assunto"
-
-#, fuzzy
 #~ msgid "Move to Folder..."
 #~ msgstr "Ir para a _pasta..."
 
@@ -12176,18 +14067,10 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgstr "_Compromisso"
 
 #, fuzzy
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "Pedido de _encontro"
-
-#, fuzzy
 #~ msgid "FIXME: _Contact"
 #~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "FIXME: Task _Request"
-#~ msgstr "_Pedido de tarefa"
-
-#, fuzzy
 #~ msgid "FIXME: _Journal Entry"
 #~ msgstr "_Entrada diАria?"
 
@@ -12260,10 +14143,6 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgstr "Encontrar"
 
 #, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "_Tarefa"
-
-#, fuzzy
 #~ msgid "Visual Alarms"
 #~ msgstr "Alarmes"
 
@@ -12271,23 +14150,10 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgid "Appointment Basics"
 #~ msgstr "Compromissos:"
 
-#~ msgid "Hours"
-#~ msgstr "Horas"
-
 #, fuzzy
 #~ msgid "Mail _to:"
 #~ msgstr "atalhos principais"
 
-#~ msgid "Minutes"
-#~ msgstr "Minutos"
-
-#~ msgid "_Mail"
-#~ msgstr "_Correio"
-
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Apagar"
-
 #, fuzzy
 #~ msgid "Hide from Sender"
 #~ msgstr "Ficheiro nЦo encontrado"
@@ -12301,10 +14167,6 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgstr "ConfiguraГЦo do correio"
 
 #, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "ConfiguraГЦo do correio"
-
-#, fuzzy
 #~ msgid "Reply-to:"
 #~ msgstr "Responder"
 
@@ -12355,9 +14217,6 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgid "_Print Contacts..."
 #~ msgstr "Imprimir contactos"
 
-#~ msgid "5 Days"
-#~ msgstr "5 Dias"
-
 #, fuzzy
 #~ msgid "Ca_lendar"
 #~ msgstr "Novo Ca_lendАrio"
@@ -12373,14 +14232,6 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgstr "Abrir Ca_lendАrio"
 
 #, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "Imprimir este calendАrio"
-
-#, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Carro"
-
-#, fuzzy
 #~ msgid "FIXME: _New Appointment"
 #~ msgstr "_Compromisso"
 
@@ -12427,10 +14278,6 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgstr "CabeГalhos:"
 
 #, fuzzy
-#~ msgid "may"
-#~ msgstr "Dia"
-
-#, fuzzy
 #~ msgid "sunday"
 #~ msgstr "Domingo"
 
@@ -12455,10 +14302,6 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgstr "PrimАrio"
 
 #, fuzzy
-#~ msgid "today"
-#~ msgstr "Hoje"
-
-#, fuzzy
 #~ msgid "next"
 #~ msgstr "PrС_ximo"
 
@@ -12486,14 +14329,6 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgstr "Enviar esta mensagem"
 
 #, fuzzy
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Sincronizar"
-
-#, fuzzy
-#~ msgid "Rebuild message view"
-#~ msgstr "Encontrar mensagens"
-
-#, fuzzy
 #~ msgid "_Save Calendar As"
 #~ msgstr "Guardar CalendАrio como"
 
@@ -12566,9 +14401,6 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgid "Closes all the open items"
 #~ msgstr "Fecha todos os items abertos"
 
-#~ msgid "Show _folder bar"
-#~ msgstr "Motrar barra de _pastas"
-
 #~ msgid ""
 #~ "Evolution detected that the file `%s' is a not a directory.\n"
 #~ "\n"
@@ -12603,9 +14435,6 @@ msgstr "NЦo se consegui inicializar Bonobo"
 #~ msgid "The %s component doesn't support PersistStream!\n"
 #~ msgstr "O componente %s nЦo suporta PersistStream!\n"
 
-#~ msgid "A folder containing calendar entries"
-#~ msgstr "Uma pasta contendo entradas de calendАrio"
-
 #~ msgid "A service containing mail items"
 #~ msgstr "Um serviГo contendo items de correio"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 95e4824a95..384bf6702b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>, 2000-2001.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -21,11 +22,11 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "CartЦo: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +34,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +42,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -49,7 +50,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -57,7 +58,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -65,7 +66,7 @@ msgstr ""
 "\n"
 "  FamМlia:    "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -73,7 +74,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -81,7 +82,7 @@ msgstr ""
 "\n"
 "Data de nascimento: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -89,7 +90,7 @@ msgstr ""
 "\n"
 "EndereГo:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -97,7 +98,7 @@ msgstr ""
 "\n"
 "  Caixa postal:"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -105,7 +106,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -113,7 +114,7 @@ msgstr ""
 "\n"
 "  Rua:         "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -121,7 +122,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -129,7 +130,7 @@ msgstr ""
 "\n"
 "  RegiЦo:      "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -137,7 +138,7 @@ msgstr ""
 "\n"
 "  CСdigo postal:"
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -145,7 +146,7 @@ msgstr ""
 "\n"
 "  PaМs:        "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -153,7 +154,7 @@ msgstr ""
 "\n"
 "RСtulo de entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -161,7 +162,7 @@ msgstr ""
 "\n"
 "Telefones:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -169,7 +170,7 @@ msgstr ""
 "\n"
 "Telefone:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -177,7 +178,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -185,7 +186,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -193,7 +194,7 @@ msgstr ""
 "\n"
 "Agente de correio: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -201,7 +202,7 @@ msgstr ""
 "\n"
 "Fuso horАrio: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -209,7 +210,7 @@ msgstr ""
 "\n"
 "LocalizaГЦo geogrАfica: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -217,7 +218,7 @@ msgstr ""
 "\n"
 "Cargo comercial: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -225,7 +226,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -233,7 +234,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -241,7 +242,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -249,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -257,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -265,7 +266,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -273,7 +274,7 @@ msgstr ""
 "\n"
 "Categorias: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -291,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -299,7 +300,7 @@ msgstr ""
 "\n"
 "String Зnica: "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -320,8 +321,8 @@ msgstr "Entre senha para %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -336,20 +337,20 @@ msgstr "NЦo foi possМvel carregar cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook nЦo foi carregado\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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:655
+#: addressbook/conduit/address-conduit.c:663
 #: 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:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 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"
 
@@ -405,204 +406,213 @@ msgstr ""
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "Co_ntatos"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Tipo de autenticaГЦo desconhecido"
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Erro ao carregar inforaГЦo do filtro:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Um"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "SubАrvore"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Tipo de escopo desconhecido"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Vincular DN:"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Editar catАlogo de endereГos"
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 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.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Conta"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
+msgstr "Incluir catАlogo de endereГos"
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "DN raiz:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Fontes de catАlogos de endereГos"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "AvanГado..."
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Porta:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Escopo de busca:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "Excluir"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "AutenticaГЦo:"
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "Um"
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
+msgstr "Escopo de busca:"
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
-msgstr "Caminho:"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Escopo de busca:"
 
-#: addressbook/gui/component/addressbook-config.c:523
+#: addressbook/gui/component/addressbook-config.glade.h:12
 #, fuzzy
-msgid "FIXME Path Help text here"
-msgstr "FIXME: o que vai aqui?"
+msgid "Server Name"
+msgstr "Selecionar nomes"
 
-#: 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.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "do"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "Editar catАlogo de endereГos"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "Incluir catАlogo de endereГos"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"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"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
 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:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "GerЙncia de conta"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_Incluir"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Servidor requer autenticaГЦo"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Porta:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Salvar mensagem como..."
+
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "Outros contatos"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "Entre senha para %s"
+#: addressbook/gui/component/addressbook.c:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Por favor, entre a sua frase-senha de %s para %s"
+
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "AutenticaГЦo"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "EndereГo eletrТnico:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Senha"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "NЦo И possМvel abrir o catАlogo de endereГos"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -610,48 +620,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Qualquer campo contИm"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Nome contИm"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "E-mail contИm"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "Nome contИm"
+msgid "Category is"
+msgstr "Categorias"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "AvanГado..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Categoria:"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "A URI que o navegador de pastas vai exibir"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Sem nome)"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "E-mail 3"
 
@@ -675,20 +710,20 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "Editar catАlogo de endereГos"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Outros contatos"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "EndereГo eletrТnico:"
@@ -712,13 +747,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Remover"
 
@@ -732,38 +764,56 @@ msgstr "Remover"
 msgid "Send HTML Mail?"
 msgstr "Sendmail"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Outros contatos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "DestinatАrios da mensagem"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "contИm"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Selecionar nomes"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "Co_ntatos"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "Selecionar nome de:"
+msgid "F_ind"
+msgstr "Localizar"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "Selecionar nomes"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "_Category:"
 msgstr "Categoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
-msgid "_Search"
-msgstr "Buscar"
+msgid "_Folder:"
+msgstr "_Pasta"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "DestinatАrios da mensagem"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -778,8 +828,8 @@ msgid "Business _Fax"
 msgstr "_Fax comercial"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
 
@@ -788,16 +838,16 @@ msgid "Contact Editor"
 msgstr "Editor de contatos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Detalhes"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Arquivar como:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Geral"
 
@@ -822,242 +872,1240 @@ msgstr "Tipos de telefone"
 msgid "Wants to receive _HTML mail"
 msgstr "Deseja receber correio _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "EndereГo de pАgina web:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_EndereГo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "Nome do a_ssistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "Ani_versАrio:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "Co_ntatos..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Excluir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "Nome _completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Residencial"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "C_argo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Nome do _gerente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "Cel_ular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Apelido:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_EscritСrio:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_ProfissЦo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_CТnjuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "E_ste И o endereГo de correspondЙncia"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "EndereГo de pАgina web:"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Assistente:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Comercial"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Comercial 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Fax comercial"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Callback"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Carro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Residencial"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Residencial 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax residencial"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Celular"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Outro fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "RАdio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "NЦo foi possМvel excluir arquivo de resumo de pasta `%s': %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 #, fuzzy
 msgid "Edit Full"
 msgstr "Editar filtros"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 #, fuzzy
 msgid "Full Name"
 msgstr "Nome completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "EndereГo _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Assistente:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "_Autoescolher"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "OrientaГЦo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "Agosto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "anos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Tamanho"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Enviando \"%s\""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "CanadА"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Carro"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Verificar endereГo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Arquivo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Carro"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Redigir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Copiando"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "_PaМs:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "FinlБndia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "EUA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Cancelar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "semana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "FinlБndia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Geral"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "Horas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Domigo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Baixa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Baixa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "Abril"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "MarГo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Correio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Margens"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Maio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Segunda-feira"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Celular"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Gerente"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Nova mensagem"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Selecionar _todos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Novo contato"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nova mensagem"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Alta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "Abril"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minuto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Agora"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Colar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "FinlБndia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Retrato"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "apСs"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "SeГУes:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "PontuaГЦo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Geral"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "Agendar reuniЦo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Enviar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "dom"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Apelido"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "FinlБndia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Vista"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "RАdio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tarefas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "FinlБndia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Para"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Hoje"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "ter"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+msgid "Turkmenistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "CanadА"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Imprimir mensagem"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Selecionar nomes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Vista"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_EndereГo:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "Cai_xa postal:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "E_stado:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "CEP/CСdi_go postal:"
 
@@ -1150,6 +2198,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Remover"
@@ -1160,7 +2209,7 @@ msgid "contact-list-editor"
 msgstr "Editor de contatos"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Editor de contatos"
@@ -1170,7 +2219,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1192,25 +2241,32 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "Outros contatos"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Outros contatos"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
+#: widgets/misc/e-filter-bar.c:243
+#, fuzzy
+msgid "Advanced Search"
+msgstr "AvanГado"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Buscar"
 
@@ -1322,45 +2378,53 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvar como vCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Send contact to other"
-msgstr "E_nviar o contato a outro..."
+msgid "Forward Contact"
+msgstr "Encaminhar"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
-msgid "Send message to contact"
+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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Excluir"
 
@@ -1377,7 +2441,8 @@ 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
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -1385,7 +2450,7 @@ msgstr "Erro desconhecido"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "PermissЦo negada"
 
@@ -1404,8 +2469,11 @@ msgid "Protocol not supported"
 msgstr "OperaГЦo nЦo suportada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "Cancelada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1436,151 +2504,151 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
 "Erro ao ler dados:\n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<clique aqui para selecionar uma data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 #, fuzzy
 msgid "File As"
 msgstr "Arquivar como:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistente:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 #, fuzzy
 msgid "Business Phone"
 msgstr "Comercial 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Callback"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 #, fuzzy
 msgid "Home Phone"
 msgstr "Residencial 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 #, fuzzy
 msgid "Business Address"
 msgstr "Comercial 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 #, fuzzy
 msgid "Home Address"
 msgstr "Verificar endereГo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "Celular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Comercial 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Residencial 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Other Phone"
 msgstr "Outros contatos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Other Address"
 msgstr "Verificar endereГo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Site web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "EscritСrio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Tratamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "ProfissЦo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Gerente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Apelido"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "CТnjuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "URL livre-ocupado"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Terminado"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr ""
 
@@ -1777,6 +2845,23 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "Fonte..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Imprimir agenda"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Imprimir agenda"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Imprimir en_velope..."
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1936,7 +3021,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "NЦo foi possМvel iniciar Gnome"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "NЦo foi possМvel iniciar Bonobo"
@@ -1946,151 +3031,142 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 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
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %e de %B de %Y"
 
-#: calendar/gui/calendar-commands.c:586
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/calendar-commands.c:604
 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/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "PЗblico"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "PЗblico"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "O"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "semana"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Ocupado"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2101,27 +3177,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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 "Nenhum"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2131,44 +3187,51 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 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:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr ""
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Nenhum"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 #, fuzzy
 msgid "Recurring"
 msgstr "RepetiГЦo"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 #, fuzzy
 msgid "Assigned"
 msgstr "Atribuir pontuaГЦ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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 #, fuzzy
 msgid "No"
 msgstr "Agora"
@@ -2193,30 +3256,89 @@ msgstr "Semana"
 msgid "Month View"
 msgstr "MЙs"
 
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Summary contains"
+msgstr "E-mail contИm"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "DescriГЦo"
+
+#: calendar/gui/cal-search-bar.c:58
+#, fuzzy
+msgid "Comment contains"
+msgstr "Nome contИm"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Agenda"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Filtro por lista de discussЦo"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Criar uma nova tarefa"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "FIXME: _Nova tarefa"
+
 #: 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-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarmes audМveis"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "DestinatАrios da mensagem"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "OpГУes de exibiГЦo"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2267,122 +3389,128 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "dias"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr "semana"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr "hora"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr "10 minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr "segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 #, fuzzy
 msgid "Run a program"
 msgstr "E_xecutar programa:"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "Criar um novo compromisso"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "Criar um novo compromisso"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "Lembre-me de todos os compromissos"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "R_esumo:"
@@ -2392,12 +3520,11 @@ msgstr "R_esumo:"
 msgid "_Options..."
 msgstr "_OpГУes"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "apСs"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "antes"
 
@@ -2416,7 +3543,7 @@ msgstr "Novo compromisso"
 msgid "hour(s)"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 #, fuzzy
 msgid "minute(s)"
 msgstr "minutos"
@@ -2435,203 +3562,227 @@ msgid "10 minutes"
 msgstr "10 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 horas (AM/PM)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 horas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minutos"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "PreferЙncias da agenda..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Soe um bip quando janelas de alarme aparecerem."
+msgid "Color for tasks due today"
+msgstr ""
 
 #: 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"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Criar um novo compromisso"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "PreferЙncias da agenda"
+#, fuzzy
+msgid "Days"
+msgstr "5 dias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Primeiro dia da semana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "Sexta-feira"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+msgid "Hours"
+msgstr "Horas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#, fuzzy
-msgid "Compress weekends in month view"
-msgstr "Comprimir fins de semana"
+msgid "Minutes"
+msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "OpГУes do navegador de datas"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Segunda-feira"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "PadrУes"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Tarefas atrasadas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "ExibiГЦo"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "SАbado"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "TИrmino do dia:"
+#, 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:19
-msgid "First day of week:"
-msgstr "Primeiro dia da semana:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Exibir nЗmeros das semanas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "sex"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "InМcio do dia:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Sexta-feira"
+#, fuzzy
+msgid "Su_n"
+msgstr "dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Domigo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "seg"
+#, fuzzy
+msgid "T_hu"
+msgstr "qui"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Segunda-feira"
+#, fuzzy
+msgid "T_ue"
+msgstr "ter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Tarefas com prazo para hoje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "Tarefas atrasadas"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Quinta-feira"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Lembre-me de todos os compromissos"
+msgid "Time"
+msgstr "Tempo"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"Fuso horАrio: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "sАb"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Unidades de tempo:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "SАbado"
+msgid "Time format:"
+msgstr "Formato da hora:"
 
 #: 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/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "TerГa-feira"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Exibir nЗmeros das semanas"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Quarta-feira"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "InМcio do dia:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "Semana Зtil"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "dom"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 horas (AM/PM)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Domigo"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 horas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "Tarefas"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "Tarefas com prazo para hoje"
+msgid "_Compress weekends in month view"
+msgstr "Comprimir fins de semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "qui"
+#, fuzzy
+msgid "_Display"
+msgstr "ExibiГЦo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Quinta-feira"
+#, fuzzy
+msgid "_End of day:"
+msgstr "TИrmino do dia:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Time"
-msgstr "Tempo"
+#, fuzzy
+msgid "_Fri"
+msgstr "sex"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Unidades de tempo:"
+#, fuzzy
+msgid "_General"
+msgstr "Geral"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Formato da hora:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Esconder mensagens _excluМdas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"Fuso horАrio: "
+msgid "_Mon"
+msgstr "seg"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "ter"
+#, fuzzy
+msgid "_Other"
+msgstr "Outro"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "TerГa-feira"
+#, fuzzy
+msgid "_Sat"
+msgstr "sАb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "qua"
+#, fuzzy
+msgid "_Task List"
+msgstr "Tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Quarta-feira"
+#, fuzzy
+msgid "_Wed"
+msgstr "qua"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
-msgid "Work Week"
-msgstr "Semana Зtil"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "minutos antes que ocorram."
+msgid "before the start of the appointment"
+msgstr "Criar um novo compromisso"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2696,65 +3847,60 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Prazo de conclusЦo"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de diАrio - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Sobrescrever arquivo?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2762,12 +3908,12 @@ 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2813,45 +3959,36 @@ msgstr "VocЙ tem certeza que deseja excluir a tarefa `%s'?"
 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/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Selecionar nome de:"
+msgid "Addressbook..."
+msgstr "Incluir catАlogo de endereГos"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "SeГУes:"
+msgid "Delegate To:"
+msgstr "Excluir"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 #, fuzzy
-msgid "Time Zones"
-msgstr ""
-"\n"
-"Fuso horАrio: "
-
-#: 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 ""
+msgid "Enter Delegate"
+msgstr "Excluir"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 #, fuzzy
 msgid "Appointment"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "RepetiГЦo"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "_ConfiguraГУes"
@@ -2860,172 +3997,188 @@ msgstr "_ConfiguraГУes"
 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/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Ocupado"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "ClassificaГЦo"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Confidencial"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Date & Time"
 msgstr "Data de envio"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "semana"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pa_rticular"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "PЗ_blico"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Exibir"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 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
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "Hora de _tИrmino:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Excluir"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "Em progresso"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Enviar como:"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Excluir..."
@@ -3070,19 +4223,18 @@ 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
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: 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:"
@@ -3126,13 +4278,14 @@ msgstr "no"
 msgid "th"
 msgstr "╨"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 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:1
+#, fuzzy
+msgid "A_dd"
+msgstr "Incluir"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3143,26 +4296,33 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Regra de repetiГЦo"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "RepetiГЦo simples"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "RepetiГЦo personalizada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Modificar"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Sem repetiГЦo"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "RepetiГЦo simples"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "por"
@@ -3204,169 +4364,164 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Cu_mprida:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "Excluir"
+msgid "Date Completed:"
+msgstr "Cumprida em:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #, fuzzy
-msgid "No one"
-msgstr "Nenhum"
+msgid "Progress"
+msgstr "Em progresso"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Tarefa"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_Prioridade:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Cu_mprida:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
 #, fuzzy
-msgid "Progress"
-msgstr "Em progresso"
+msgid "Assignment"
+msgstr "Atribuir pontuaГЦo"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "DescriГЦo"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Data de _inМcio:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Prazo de _conclusЦo:"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 #, 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "C_olar"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marcar como cumprida"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Excluir esta tarefa"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marcar como cumprida"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Exclui a tarefa"
 
-#: calendar/gui/e-calendar-table.c:1137
+#: calendar/gui/e-calendar-table.c:1130
 #, fuzzy
-msgid "Click here to add a task"
+msgid "Click 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"
@@ -3401,23 +4556,23 @@ msgstr "PosiГЦo geogrАfica"
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Data de inМcio"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
 msgid "Task sort"
 msgstr "Tarefas"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Transparency"
-msgstr "TransparЙncia"
-
 #: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
@@ -3429,155 +4584,264 @@ 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:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3306
-#, fuzzy
-msgid "New _Appointment"
-msgstr "Novo compromisso"
-
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Dia _inteiro"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Ir para hoje"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Ir para data"
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Excluir este compromisso"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar este compromisso mСvel"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Excluir esta ocorrЙncia"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Excluir todas as ocorrЙncias"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "E_ste И o endereГo de correspondЙncia"
+msgid "Meeting Information"
+msgstr "Sem informaГЦo"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 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:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "_ConfiguraГУes"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Hora de _tИrmino da reuniЦo:"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:633
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Este arquivo existe mas nЦo И legМvel."
+msgid "Meeting Update Request"
+msgstr "FIXME: _Pedido de reuniЦo"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "E_ste И o endereГo de correspondЙncia"
+
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "_ConfiguraГУes"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Executar aГУes"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Enviando mensagem"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Sem informaГЦo"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "Tarefas"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "foi apСs"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "FIXME: _Pedido de tarefa"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Responder"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "A pasta aparenta estar corrompida de modo irrecuperАvel."
+msgid "Task Cancellation"
+msgstr "Cancelada"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Agenda"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "InformaГЦo do usuАrio"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "InformaГЦo do usuАrio"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL livre-ocupado"
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL livre-ocupado"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Imprimir mensagem"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Cumprida em:"
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% Cu_mprida:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Data de envio"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
@@ -3619,44 +4883,27 @@ msgstr ""
 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 "Todos"
-
-#: calendar/gui/e-tasks.c:252
-msgid "Category:"
-msgstr "Categoria:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, 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:415
+#: calendar/gui/e-tasks.c:361
 #, 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: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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Novo compromisso..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, 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:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O mИtodo necessАrio para abrir `%s' nЦo И suportado"
@@ -3682,43 +4929,43 @@ msgid "Go To Date"
 msgstr "Ir para data"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Julho"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Junho"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "MarГo"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Maio"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Novembro"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Outubro"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "Ir para hoje"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3874,12 +5121,6 @@ msgstr "se"
 msgid "Sa"
 msgstr "sА"
 
-#: 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:1815
 #, fuzzy
@@ -3916,9 +5157,8 @@ msgid "Print Calendar"
 msgstr "Imprimir agenda"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Visualizar impressЦo"
 
@@ -3931,7 +5171,7 @@ msgstr "Imprime este item"
 msgid "Print Setup"
 msgstr "Configurar impressЦo..."
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "A URI da pasta de tarefas a ser exibida"
 
@@ -3967,6 +5207,103 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DSTQQSS"
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+#, fuzzy
+msgid "contains? expects 2 arguments"
+msgstr "Erro de sintaxe nos parБmetros ou argumentos"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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"
@@ -4034,7 +5371,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-filter-driver.c:667
-#, fuzzy
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recuperando mensagem %s"
 
@@ -4075,7 +5412,7 @@ msgstr "Erro ao salvar arquivo: %s"
 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
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar busca por filtro: %s: %s"
@@ -4102,12 +5439,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -4225,13 +5562,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "NЦo foi possМvel criar pipe para GPG/PGP: %s"
@@ -4249,16 +5586,16 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr "NЦo foi possМvel criar arquivo temporАrio: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 #, fuzzy
 msgid "No plaintext to encrypt."
 msgstr "Clique no Мcone para decifrar."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Sem destinatАrios especificados"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4292,7 +5629,7 @@ msgid "Connection cancelled"
 msgstr "ConexЦo cancelada"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "NЦo foi possМvel conectar Ю %s (porta %d): %s."
@@ -4303,7 +5640,7 @@ msgstr "(mАquina desconhecida)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "OperaГЦo cancelada"
 
@@ -4436,42 +5773,69 @@ msgstr "Esta opГЦo conectarА ao servidor IMAP usando uma senha em texto claro."
 msgid "Unknown authentication state."
 msgstr "NЦo И necessАria autenticaГЦo"
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Senha"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Fonte"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: 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
+#: camel/camel-service.c:155
 #, 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:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "A URL '%s' precisa de um componente mАquina"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "A URL '%s' precisa de um componente caminho"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4484,12 +5848,12 @@ msgstr "Provedor de correio em pastas virtuais"
 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
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "NЦo existe provedor disponМvel para o protocolo `%s'"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4536,7 +5900,7 @@ msgstr "Anexar um arquivo Ю mensagem"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4544,7 +5908,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4590,51 +5954,51 @@ msgstr ""
 "VocЙ pode apenas editar mensagens salvas\n"
 "na pasta Drafts."
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Falhou o comando IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "Resposta do servidor terminou cedo demais."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, 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:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, 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:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, 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
+#: camel/providers/imap/camel-imap-folder.c:209
 #, 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:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, 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:1491
 #: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
@@ -4642,12 +6006,12 @@ 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
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Salvando mensagens"
@@ -4661,7 +6025,7 @@ msgstr "NЦo foi possМvel localizar corpo da mensagem na resposta FETCH."
 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
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Criar um novo correio eletrТnico"
@@ -4671,7 +6035,7 @@ msgstr "Criar um novo correio eletrТnico"
 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
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Pastas"
 
@@ -4713,7 +6077,7 @@ msgstr ""
 "NЦo existe suporte para o mecanismo de autenticaГЦo pedido."
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "NЦo И necessАria autenticaГЦo"
@@ -4724,7 +6088,7 @@ 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:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -4739,12 +6103,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "NЦo existe a pasta `%s'."
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4837,7 +6201,7 @@ msgstr "NЦo И possМvel acrescentar mensagem Ю pasta maildir: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4851,7 +6215,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4924,20 +6288,20 @@ msgstr "NЦo И possМvel abrir mbox: %s: %s\n"
 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-mbox-folder.c:209
 #: 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:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, 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:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4949,12 +6313,12 @@ msgstr ""
 "NЦo И possМvel obter mensagem: %s da pasta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falha ao construir a mensagem: mbox corrompida?"
@@ -5003,13 +6367,13 @@ msgstr "Pasta `%s' nЦo estА vazia. Ela nЦo foi excluМda."
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing 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:296
@@ -5019,24 +6383,22 @@ 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:371
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
 msgstr "NЦo И possМvel resumir a pasta: %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:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "NЦo foi possМvel abrir pasta para resumir: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5142,6 +6504,17 @@ msgstr "Pastas locais nЦo podem ser aninhadas."
 msgid "Spool folders cannot be deleted"
 msgstr "Pastas locais nЦo podem ser aninhadas."
 
+#: 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-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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5232,41 +6605,41 @@ msgstr ""
 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:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Recuperando mensagens"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, 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
+#: camel/providers/pop3/camel-pop3-folder.c:235
 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:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "NЦo existe mensagem com uid %s"
-
-#: 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
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, 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
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, 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-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "NЦo existe mensagem com uid %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Recuperando mensagem %s"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 #, fuzzy
 msgid "Message storage"
@@ -5282,7 +6655,7 @@ msgstr "Manter correio no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Exclui a tarefa"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5376,7 +6749,7 @@ msgid "No such folder `%s'."
 msgstr "NЦo existe a pasta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5434,7 +6807,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correio usando o programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5442,130 +6815,130 @@ msgstr "SMTP"
 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:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando nЦo reconhecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos parБmetros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Comando nЦo implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "ParБmetro de comando nЦo implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr "Estado do sistema ou resposta de ajuda do sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Mensagem de ajuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "ServiГo pronto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "ServiГo fechando canal de transmissЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "ServiГo indisponМvel, fechando canal de transmissЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "AГЦo de correio pedida OK, terminada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 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:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 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:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 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:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "AГЦo pedida abortada: erro no processamento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 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:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 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:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 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:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 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:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Inicie entrada da mensagem; termine com <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "A transaГЦo falhou"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "NЦo foi fornecida uma senha."
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 #, 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
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "NЦo И necessАria autenticaГЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 #, fuzzy
 msgid "Authentication required"
 msgstr "NЦo И necessАria autenticaГЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, 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:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, fuzzy, c-format
 msgid "SMTP 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/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5576,132 +6949,132 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correio SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 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:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 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:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 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:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, 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:744
-msgid "Error creating SASL authentication object."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "AutenticaГЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 #, 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
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, 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:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, 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:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta de QUIT: %s: nЦo-fatal"
@@ -5731,7 +7104,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "anexo"
 
@@ -5764,52 +7137,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Clique aqui para o catАlogo de endereГos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Responder-a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinatАrios da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endereГos que receberЦo uma cСpia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5840,46 +7213,46 @@ msgstr ""
 "Erro ao preparar para %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Trabalhando"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, 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:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5888,7 +7261,7 @@ msgstr ""
 "NЦo И possМvel criar arquivo de saМda: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5897,7 +7270,7 @@ msgstr ""
 "NЦo И possМvel criar arquivo de saМda: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5906,13 +7279,13 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5922,25 +7295,25 @@ msgstr ""
 "\n"
 "VocЙ deseja salvar as suas modificaГУes?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "FIXME: Inserir arquivo"
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "NЦo foi possМvel criar janela de redaГЦo."
 
@@ -5968,59 +7341,99 @@ msgstr "EndereГo _2:"
 msgid "calendar information"
 msgstr "InformaГЦo do usuАrio"
 
+#: default_user/searches.xml.h:1
+msgid "Body contains"
+msgstr "Corpo contИm"
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr "Corpo nЦo contИm"
+
+#: default_user/searches.xml.h:3
+msgid "Body or subject contains"
+msgstr "Corpo ou assunto contИm"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Nome contИm"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "DestinatАrios"
+
+#: default_user/searches.xml.h:6
+msgid "Sender contains"
+msgstr "Remetente contИm"
+
+#: default_user/searches.xml.h:7
+msgid "Subject contains"
+msgstr "Assunto contИm"
+
+#: default_user/searches.xml.h:8
+msgid "Subject does not contain"
+msgstr "Assunto nЦo contИm"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 #, 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 #, 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %d/%m/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -6028,14 +7441,14 @@ 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
+#: e-util/e-time-utils.c:313
 #, 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
+#: e-util/e-time-utils.c:322
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -6134,7 +7547,7 @@ msgstr "um instante relativo ao instante atual"
 msgid "Compare against"
 msgstr "Comparar em relaГЦo a"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "agora"
 
@@ -6146,11 +7559,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %k:%M"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<clique aqui para selecionar uma data>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Regras de filtro"
 
@@ -6171,20 +7588,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:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Entre URI da pasta"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para selecionar uma pasta>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6205,62 +7622,51 @@ msgstr "Nome da regra: "
 msgid "Untitled"
 msgstr "Sem tМtulo"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Executar aГУes"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "se todos os critИrios forem atendidos"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "se algum critИrio for atendido"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Adicionar critИrio"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "de entrada"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "outgoing"
 msgstr "de saМda"
 
-#: 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.glade.h:3 mail/mail-config.glade.h:34
-msgid "Edit"
-msgstr "Editar"
-
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Editar filtros"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Editar pastas virtuais"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "De entrada"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "De saМda"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Pastas virtuais"
 
@@ -6286,201 +7692,202 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Registrar pasta local"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Atribuir cor"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Atribuir pontuaГЦo"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "Anexo"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contИm"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copiar para pasta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Data de recebimento"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Data de envio"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Deleted"
 msgstr "Excluir"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "nЦo contИm"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nЦo termina com"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "nЦo existe"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "nЦo soa como"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "nЦo comeГa com"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "nЦo existe"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Draft"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "termina com"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "Sair"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "ExpressЦo"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "И"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "И maior que"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "И menor que"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "nЦo И"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 #, fuzzy
 msgid "Mailing list"
 msgstr "Lista de discussЦo %s"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Corpo da mensagem"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "CabeГalho da mensagem"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "Mensagem foi recebida"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "Mensagem foi enviada"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Mover para pasta"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "em ou apСs"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "em ou antes"
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Lida"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "DestinatАrios"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "CorrespondЙncia com expressЦo regular"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Em resposta a"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 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
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Remetente"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Atribuir estado"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Tamanho"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "soa como"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Source Account"
 msgstr "Conta"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "CabeГalho especМfico"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "comeГa com"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Assunto"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "contИm"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "nЦo contИm"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "nЦo termina com"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "nЦo existe"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "nЦo soa como"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "nЦo comeГa com"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "termina com"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "И maior que"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "И menor que"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "nЦo И"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "И"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "em ou apСs"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "em ou antes"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "soa como"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "comeГa com"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "foi apСs"
@@ -6513,15 +7920,14 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Correio"
 
@@ -6547,12 +7953,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "_ConfiguraГУes"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6610,181 +8016,201 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr "ConfiguraГЦo de correio"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Filtro por lista de discussЦo"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "_Propriedades..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Modificar as propriedades do arquivo"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "_Mensagem de correio"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "_Mensagem de correio"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "NЦo И possМvel iniciar o componente de correio do Evolution."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "NЦo И possМvel registrar repositСrio com a shell."
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Propriedades"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:893
-msgid "Store search as vFolder"
-msgstr "Armazenar busca como pasta virtual"
+#: mail/folder-browser.c:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "Criar regra a partir da mensagem"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por assunto"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinatАrios"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtro por lista de discussЦo"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtro por assunto"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtro por remetente"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtro por destinatАrios"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtro por lista de discussЦo"
 
-#: mail/folder-browser.c:1273
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "Resend"
-msgstr "segundo"
+msgid "_Edit as New Message..."
+msgstr "_Salvar mensagem como..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Salvar _como..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Responder ao remetente"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Marcar como lida"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marcar como nЦo lida"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Importante"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marcar como nЦo lida"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_Mover para pasta..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Copiar para pasta..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "Des_fazer exclusЦo"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Incluir catАlogo de endereГos"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Aplicar filtros"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Criar regra a partir da mensagem"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filtro por lista de discussЦo"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Filtro por lista de discussЦo"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtro por lista de discussЦo (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtro por lista de discussЦo (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Sem informaГЦo"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr ""
@@ -6846,16 +8272,16 @@ msgid "Evolution News Editor"
 msgstr "Editor de contas do Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Assinatura:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6866,43 +8292,48 @@ msgstr ""
 "\n"
 "VocЙ deseja salvar as suas modificaГУes?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (padrЦo)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 #, fuzzy
 msgid "Disable"
 msgstr "Desativado"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 #, 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
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Desfazer exclusЦo"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "Torne esta a minha conta padrЦo"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 #, 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-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "_ConfiguraГУes"
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6956,11 +8387,11 @@ msgstr ""
 "VocЙ deve configurar um transporte de correio\n"
 "antes de poder redigir uma mensagem."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 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:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6968,7 +8399,7 @@ msgstr ""
 "Esta mensagem nЦo possui um assunto.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6976,37 +8407,36 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 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:410
+#: mail/mail-callbacks.c:390
 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:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Mensagem encaminhada:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Copiar mensagem(ns) para"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, 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
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -7014,7 +8444,7 @@ msgstr ""
 "VocЙ pode apenas editar mensagens salvas\n"
 "na pasta Drafts."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -7023,25 +8453,43 @@ msgstr ""
 "VocЙ pode apenas editar mensagens salvas\n"
 "na pasta Drafts."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, 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:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Mensagem foi recebida"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Salvar mensagem como..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Salvar mensagens como..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+#, fuzzy
+msgid "Warning"
+msgstr "Trabalhando"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Enviar esta mensagem agora"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -7050,133 +8498,146 @@ msgstr ""
 "Erro ao carregar inforaГЦo do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "Editar filtros"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Falhou a impressЦo da mensagem"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, 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
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Assitente de contas do Evolution"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 #, 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
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "InformaГЦo de conta"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "GerЙncia de conta"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Accounts"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "AutenticaГЦo"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Tipo de autenticaГЦo:"
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "Redigir"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7192,299 +8653,273 @@ msgstr ""
 "\n"
 "Pressione \"Concluir\" para salvar suas configuraГУes."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "De_fault"
 msgstr "PadrЦo"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "ExibiГЦo"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 #, fuzzy
 msgid "Drafts"
 msgstr "Dias"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Criando nova pasta"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:30
 #, fuzzy
-msgid "Edit..."
-msgstr "Editar"
+msgid "E_nable"
+msgstr "Desativado"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "EndereГo eletrТnico:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Salvar o arquivo atual com um nome diferente"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Editar"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "Desativado"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Nome completo:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "Assinatura:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr ""
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "Visualizar embutido"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "ConfiguraГЦo de correio"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Formato da caixa de correio"
 
-#: 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:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "Marcar mensagens como \"Lida\" apСs:"
+msgid "Make this my _default account"
+msgstr "Torne esta a minha conta padrЦo"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "NotМcias"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Optional Information"
 msgstr "Sem informaГЦo"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Empresa:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-#, fuzzy
-msgid "PGP binary path:"
-msgstr "Cifrar com PGP"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Prompt when sending messages with an empty subject"
+msgid "Prompt when sending messages with an _empty subject"
 msgstr "Concatenando uma mensagem sem um assunto"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+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
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "maildir"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "Nota"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "InformaГЦo do usuАrio"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_SeguranГa"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Selecionar arquivo de assinatura"
+
+#: mail/mail-config.glade.h:69
 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:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Sent"
 msgstr "Vista"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Enviar a mensagem agora"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Enviar a mensagem mais tarde"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "ConfiguraГЦo do servidor"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Tipo do servidor: "
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "Servidor requer autenticaГЦo"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Arquivo de assinatura:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Fonte"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Sem informaГЦo"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "Arquivo mbox padrЦo do Unix"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "Use secure connection (SSL)"
+msgid "Use secure connection (_SSL)"
 msgstr "Este servidor requer uma conexЦo segura (SSL)"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Nome do usuАrio:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7492,15 +8927,116 @@ msgstr ""
 "\n"
 "Pressione \"PrСximo\" para comeГar. "
 
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+msgid "_Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+msgid "_Check for supported types"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "EndereГo eletrТnico:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Nome completo:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "Assinatura:"
+
+#: mail/mail-config.glade.h:100
+msgid "_Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "MАquina:"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "Marcar mensagens como \"Lida\" apСs:"
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "Nome:"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Empresa:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "Cifrar com PGP"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Caminho:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Lembrar esta senha"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Enviar mensagens em formato HTML como padrЦo."
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Arquivo de assinatura:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome do usuАrio:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "segundos."
 
@@ -7549,189 +9085,200 @@ msgstr "NЦo foi possМvel criar caixa de diАlogo."
 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
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Salvar anexo"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Salvar para o disco..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Visualizar embutido"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualizar embutido (via %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Esconder"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Visualizador externo"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Carregando conteЗdo da mensagem"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Abrir em uma nova janela"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Copiar a seleГЦo"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Salvar na _pasta... (FIXME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salvar como..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Excluir"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 #, 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
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "EndereГo eletrТnico:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "Responder-a:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Sem programa GPG/PGP disponМvel."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "Mensagem cifrada nЦo exibida"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Mensagem cifrada"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Clique no Мcone para decifrar."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 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:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Esta mensagem estА assinada digitalmente mas nЦo И possМvel estabelecer sua "
 "autenticidade."
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, 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:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "NЦo existe a pasta `%s'."
+
+#: mail/mail-local.c:460
 #, fuzzy, c-format
-msgid "Opening '%s'"
+msgid "Registering '%s'"
 msgstr "Abrir em %s..."
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Alterando pasta \"%s\" para o formato \"%s\""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7740,7 +9287,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:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7748,11 +9295,11 @@ msgstr ""
 "Se vocЙ nЦo pode mais abrir esta caixa postal\n"
 "entЦo vocЙ precisar reparА-la manualmente."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "Configurar %s"
@@ -7775,108 +9322,133 @@ msgstr ""
 "Erro ao executar operaГЦo:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Lembrar esta senha"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Trabalhando"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Filtro por _remetente"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Recebendo mensagem"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensagem"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Salvando mensagem %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 #, fuzzy
 msgid "Complete."
 msgstr "Cumprida"
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mover a mensagem para uma nova pasta"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensagens"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 #, fuzzy
 msgid "Trash"
 msgstr "Tarefa"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Abrindo pasta %s"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Sincronizar"
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Reconfigurando pasta"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando mensagem %s"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recuperando mensagens"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvando mensagens"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7885,7 +9457,7 @@ msgstr ""
 "NЦo И possМvel criar arquivo de saМda: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7894,12 +9466,12 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Salvar anexo"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7908,89 +9480,84 @@ msgstr ""
 "NЦo И possМvel criar arquivo de saМda: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "NЦo foi possМvel escrever dados: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Conectando ao servidor"
 
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Buscar"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Sem nome)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "_Editar mensagem"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "Enviando mensagem"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "Buscar por uma expressЦo"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "Localizar"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "Caminho:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Cancelada"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 #, 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
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:323
-#, fuzzy
-msgid "Sending"
-msgstr "Enviando \"%s\""
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancelada"
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 #, fuzzy
 msgid "User canceled operation."
 msgstr "O usuАrio cancelou a consulta."
@@ -8010,88 +9577,94 @@ msgstr "Mensagem encaminhada - %s"
 msgid "Forwarded message"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Enc: (sem assunto)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "_Mensagem"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "NЦo vista"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Esconder mensagens _excluМdas"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "_Mensagem de correio"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %k:%M"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "Salvando mensagens"
 
 #: mail/message-list.etspec.h:2
@@ -8106,39 +9679,78 @@ msgstr "Recebida"
 msgid "Size"
 msgstr "Tamanho"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Pasta"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "RepositСrio"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Exibir pastas comeГando com:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Varrendo pastas em \"%s\""
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Obtendo repositСrio para \"%s\""
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Varrendo pastas em \"%s\""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Assinando a pasta \"%s\""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Cancelando assinatura da pasta \"%s\""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Pasta"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "Mensagem foi recebida"
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Atualizar lista"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Pastas"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "OpГУes de exibiГЦo"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Gerenciar assinaturas..."
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Assinar"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Cancelar a assinatura"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -8148,55 +9760,72 @@ msgstr ""
 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
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 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
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 #, fuzzy
 msgid "Appointments"
 msgstr "Compromisso - %s"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Exibir compromissos"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%H:%M"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%a %k:%M"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Sem resumo"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Nome:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "InstalaГЦo do Evolution"
+msgid "Summary Settings"
+msgstr "ConfiguraГУes do Executive Summary..."
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8207,7 +9836,12 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Erro ao carregar agenda</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Nova pasta virtual"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Exibir tarefas"
@@ -8216,28 +9850,33 @@ msgstr "Exibir tarefas"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/e-summary-weather.c:664
 #, 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"
+msgid "%A, %B %e %Y"
+msgstr "%A, %d de %B, %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolution"
+msgid "Print Summary"
+msgstr "Resumo"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "Falhou a impressЦo da mensagem"
 
 #: my-evolution/main.c:52
@@ -8245,6 +9884,42 @@ msgstr "Falhou a impressЦo da mensagem"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "NЦo foi possМvel iniciar Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Movendo"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Editar filtros"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "Editar filtros"
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9426,126 +11101,142 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Respondida"
+msgid " _Remove"
+msgstr "Remover"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Pastas"
+msgid "Add n_ew feed"
+msgstr "Respondida"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Todos os participantes"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "Todos os participantes"
+msgid "All _folders:"
+msgstr "Pastas"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Exibir pastas comeГando com:"
+msgid "All news _feeds:"
+msgstr "Respondida"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "OpГУes de exibiГЦo"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "ExibiГЦo"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "Sexta-feira"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "mЙs"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "semana"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Exibir tarefas"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "Exibir tarefas"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "Quarta-feira"
+msgid "Tasks "
+msgstr "Tarefas"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "mЙs"
+msgid "Units: "
+msgstr ""
+"\n"
+"  Unidade:  "
 
 #: 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 ""
+msgid "Weather settings"
+msgstr "Limpar a seleГЦo"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr "Agendar reuniЦo"
+msgid "_Display folders:"
+msgstr "Exibir pastas comeГando com:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Exibir tarefas"
+msgid "_Display stations:"
+msgstr "OpГУes de exibiГЦo"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
-msgstr ""
+#, fuzzy
+msgid "_Displayed feeds:"
+msgstr "ExibiГЦo"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Exibir tarefas"
+msgid "_Five days"
+msgstr "Sexta-feira"
 
 #: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "Tasks "
-msgstr "Tarefas"
+msgid "_Mail"
+msgstr "_Correio"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  Unidade:  "
+msgid "_News Feeds"
+msgstr "Nova pasta virtual"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Outro"
+msgid "_One day"
+msgstr "Quarta-feira"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "Limpar a seleГЦo"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "Abril"
+msgid "_Schedule"
+msgstr "Agendar reuniЦo"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "Exibir _todas as mensagens"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "Abril"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9562,7 +11253,17 @@ msgstr "Detalhes"
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Pastas virtuais"
@@ -9615,7 +11316,7 @@ msgid ""
 "`%s'."
 msgstr "Um erro ocorreu ao ler o arquivo."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9626,7 +11327,7 @@ msgstr ""
 "Por favor o mova para permitir a instalaГЦo\n"
 "dos arquivos de usuАrio do Evolution."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9635,7 +11336,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9646,57 +11347,81 @@ msgstr ""
 "do Evolution. Por favor, o mova para permitir\n"
 "a instalaГЦo dos arquivos de usuАrio do Evolution."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "NЦo И possМvel obter pasta: %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, 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
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copiar para pasta"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Mover para pasta"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"NЦo foi possМvel excluir pasta `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Selecionar pasta"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, 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
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "Abrindo pasta %s"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Nome da regra: "
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nome do arquivo:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9710,7 +11435,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "O nome especificado para a pasta И invАlido."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Criar nova pasta"
 
@@ -9722,11 +11447,11 @@ msgstr ""
 "O tipo da pasta selecionada nЦo И vАlido para\n"
 "a operaГЦo desejada."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Novo..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Sem nome)"
 
@@ -9756,7 +11481,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9802,7 +11527,7 @@ msgstr "_Autoescolher"
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 #, fuzzy
 msgid "Select a file"
 msgstr "Selecionar arquivo de assinatura"
@@ -9812,32 +11537,54 @@ msgstr "Selecionar arquivo de assinatura"
 msgid "File type:"
 msgstr "Nome do arquivo:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "NЦo И possМvel iniciar o componente de correio do Evolution."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 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:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nЦo pТde ser executado."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9847,89 +11594,106 @@ msgstr ""
 "para correio, agenda e gerenciamento de contatos\n"
 "dentro do ambiente GNOME."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Ir para a pasta..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, 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
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Work Offline"
 msgstr "Trabalhando"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta exibida)"
 
-#. 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "NЦo И possМvel definir repositСrio local -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Ooops! A visualizaГЦo para `%s' terminou inesperadamente. :-(\n"
 "Isto provavelmente significa que o componente %s falhou."
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "ConteЗdo de mensagem invАlido"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "NЦo И possМvel registrar repositСrio com a shell."
+
+#: shell/e-shell.c:1648
+#, fuzzy
+msgid "Configuration Database not found"
+msgstr "Assitente de configuraГЦo de correio"
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Erro genИrico"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9938,182 +11702,168 @@ msgstr ""
 "VocЙ deseja realmente excluir o grupo\n"
 "`%s' da barra de atalhos?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "NЦo remover"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "мcones _pequenos"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Exibe os atalhos como Мcones pequenos"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "мcones _grandes"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Exibe os atalhos como Мcones grandes"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Novo group..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Excluir este grupo..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Excluir este grupo..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "Es_conder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Esconder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New Window"
 msgstr "_Abrir em uma nova janela"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:479
-#, fuzzy
-msgid "Rename"
-msgstr "Nome da regra: "
-
-#: shell/e-shortcuts-view.c:479
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remove este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erro ao salvar atalhos."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Fontes"
 
-#: shell/e-shortcuts.c:984
-#, fuzzy
-msgid "Inbox"
-msgstr "mbox"
-
-#: shell/e-shortcuts.c:987
-#, fuzzy
-msgid "Contacts"
-msgstr "Co_ntatos"
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Sem nome)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Sem erro"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Erro genИrico"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "JА existe uma pasta com o mesmo nome"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "O tipo de pasta especificado nЦo И vАlido"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "NЦo hА espaГo suficiente para criar a pasta"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "A pasta especificada nЦo foi achada"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "FunГЦo nЦo implementada neste repositСrio"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "OperaГЦo nЦo suportada"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado nЦo И suportado neste repositСrio"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "A pasta especificada nЦo foi achada"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% Cu_mprida:"
 
@@ -10135,11 +11885,6 @@ msgstr "MАquina:"
 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:"
@@ -10156,18 +11901,27 @@ msgstr ""
 
 #: shell/importer/import.glade.h:2
 #, fuzzy
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr "Editor de contas do Evolution"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Utility"
+msgid "Evolution Importer Assistant"
 msgstr "Editor de contas do Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Selecionar arquivo de assinatura"
+
 #: 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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -10186,10 +11940,10 @@ msgid "Don't ask me again"
 msgstr ""
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10206,7 +11960,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10214,25 +11968,30 @@ msgstr ""
 "Obrigado\n"
 "The Evolution Team\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "NЦo И possМvel iniciar o Evolution."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "NЦo И possМvel iniciar o Evolution."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 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-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Copiar"
 
@@ -10249,11 +12008,11 @@ msgstr "Criar novo contato"
 msgid "Create new contact list"
 msgstr "Criar novo contato"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Recortar"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Recortar a seleГЦo"
 
@@ -10262,81 +12021,126 @@ msgstr "Recortar a seleГЦo"
 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:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "NotМcias"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Colar"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Colar a Аrea de transferЙncia"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Visualiza a impressЦo da mensagem a ser impressa"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Imprimir contatos"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "Apagar um contato"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Selecionar todos"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Apagar um contato"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Enviar _mensagem ao contato..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "Apagar um contato"
+
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Enviar _mensagem ao contato..."
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "E_nviar o contato a outro..."
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Parar a carga"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+#, fuzzy
+msgid "_Actions"
+msgstr "_AГУes"
+
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Fontes de catАlogos de endereГos"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Contact"
 msgstr "Co_ntatos"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 msgstr "Co_ntatos"
 
-#: 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "Co_ntatos..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Salvar como vCard"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Busca por contatos"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Select All"
 msgstr "Selecionar 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -10346,122 +12150,139 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "Criar um novo compromisso"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Criar um novo compromisso"
+msgid "Create a New _Task"
+msgstr "Criar uma nova tarefa"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Criar um novo compromisso"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Day"
+msgstr "Dia"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Excluir este compromisso"
+
+#: ui/evolution-calendar.xml.h:13 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"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Voltar no tempo"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "AvanГar no tempo"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to _Date"
 msgstr "Ir para data"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Ir para uma data especМfica"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Ir para o presente"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Ir para hoje"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "MЙs"
+
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "New Appointment"
 msgstr "Novo compromisso"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 #, fuzzy
-msgid "Previews the calendar to be printed"
-msgstr "Visualiza a impressЦo da mensagem a ser impressa"
+msgid "New Task"
+msgstr "FIXME: _Nova tarefa"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
-msgid "Print calendar"
-msgstr "Imprimir agenda"
+msgid "Previews the calendar to be printed"
+msgstr "Visualiza a impressЦo da mensagem a ser impressa"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 #, fuzzy
-msgid "Print this Calendar"
-msgstr "Imprimir esta agenda"
+msgid "Print Pre_view"
+msgstr "Visualizar impressЦo"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "InformaГЦo do usuАrio"
+msgid "Print this calendar"
+msgstr "_Imprimir esta agenda"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Exibe 1 dia"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Exibe 1 mЙs"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Exibe 1 semana"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Exibe a semana Зtil"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
-msgid "W_ork Week"
-msgstr "Semana Зtil"
+msgid "Week"
+msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "Novo compromisso..."
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, 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
+#: ui/evolution-calendar.xml.h:41
 #, fuzzy
-msgid "_Month"
-msgstr "MЙs"
+msgid "_Publish Free/Busy Information"
+msgstr "InformaГЦo do usuАrio"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
-msgid "_Week"
-msgstr "Semana"
+msgid "_Task..."
+msgstr "Tarefa"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10472,15 +12293,16 @@ msgid "Close"
 msgstr "Fechar"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Fechar este compromisso"
+#, fuzzy
+msgid "Close this item"
+msgstr "Exclui este item"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Excluir este compromisso"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Exclui este item"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Barra de tarefas principal"
 
@@ -10489,118 +12311,85 @@ msgstr "Barra de tarefas principal"
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Salvar"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Salva a tarefa e fecha a caixa de diАlogo"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Ajuda"
-
 #: ui/evolution-contact-editor.xml.h:5
 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-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Salvar _como..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Salva o contato e fecha a caixa de diАlogo"
 
-#: ui/evolution-contact-editor.xml.h:11
-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:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Salvar"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Exclui este item"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Excluir..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Salva a tarefa e fecha a caixa de diАlogo"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "E_nviar o contato a outro..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "Enviar _mensagem ao contato..."
@@ -10610,21 +12399,21 @@ msgstr "Enviar _mensagem ao contato..."
 msgid "Cancel Mee_ting"
 msgstr "Agendar reuniЦo"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, 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
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, 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
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10637,17 +12426,11 @@ msgstr "Atualizar lista"
 msgid "Schedule _Meeting"
 msgstr "Agendar _reuniЦo"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "Agendar reuniЦo"
 
-#: 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"
@@ -10663,69 +12446,65 @@ 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-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "Redigir uma nova mensagem"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Esquecer _senhas"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:10
 #, fuzzy
-msgid "Manage _Subscriptions..."
-msgstr "Gerenciar assinaturas..."
+msgid "New Message"
+msgstr "_Mensagem"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Recebida"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 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
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Editor de pastas _virtuais..."
@@ -10755,98 +12534,108 @@ msgstr "Visualizar"
 msgid "_Send / Receive"
 msgstr "Recebida"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "Assinando a pasta \"%s\""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Esconder mensagens _selecionadas"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Recortar"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Imprime a mensagem selecionada"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Esconder mensagens _selecionadas"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Esconder mensagens _excluМdas"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Esconder mensagens _lidas"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Marcar como lida"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "Marcar mensagens como \"Lida\" apСs:"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Colar a Аrea de transferЙncia"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Selecionar _todos"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
 msgid "Select _Thread"
 msgstr "Selecionar _todos"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Exclui esta mensagem"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 #, fuzzy
-msgid "Show _All"
-msgstr "Exibir todos"
+msgid "Sh_ow Hidden Messages"
+msgstr "Esconder mensagens _lidas"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Imprime a mensagem selecionada"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Lista de mensagens encadeadas"
 
@@ -10854,7 +12643,7 @@ msgstr "Lista de mensagens encadeadas"
 msgid "_Expunge"
 msgstr "_Excluir permanentemente"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Pasta"
 
@@ -10862,11 +12651,11 @@ msgstr "_Pasta"
 msgid "_Invert Selection"
 msgstr "_Inverter seleГЦo"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Lista de mensagens encadeadas"
@@ -11110,7 +12899,8 @@ 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"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Visualiza a impressЦo da mensagem a ser impressa"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11132,43 +12922,37 @@ msgstr "Imprimir mensagem"
 msgid "Previous Unread Message"
 msgstr "Imprimir mensagem"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Imprimir mensagem..."
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "Visualizar impressЦo"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Imprimir mensagem"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Responder"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "_Mensagem"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Salvar a mensagem em uma pasta especificada"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar a pАgina para a sua impressora atual"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -11217,76 +13001,58 @@ msgstr "Pasta virtual por _destinatАrios"
 msgid "VFolder on _Subject..."
 msgstr "Pasta virtual por assunto"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Aplicar filtros"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copiar para pasta"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Criar regra a partir da mensagem"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Mensagens encaminhadas"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "_ExibiГЦo"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Mover para pasta"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "_ExibiГЦo"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Mensagem"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "_Editar mensagem"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: 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-messagedisplay.xml.h:4 ui/evolution.xml.h:11
-msgid "Customize"
-msgstr "Personalizar"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
-msgid "Customize toolbars"
-msgstr "Personalizar barras de ferramentas"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Fechar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Visualizar"
 
@@ -11353,11 +13119,6 @@ msgstr "Cifrar com PGP"
 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"
@@ -11492,7 +13253,7 @@ msgstr "Responder-a:"
 msgid "_Security"
 msgstr "_SeguranГa"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "Aj_uda"
 
@@ -11526,15 +13287,28 @@ msgstr "Cancelar a assinatura"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "FIXME: Atri_buir tarefa"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "Cancelar"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Exclui a tarefa"
+msgid "Cancel this task"
+msgstr "Cancelar"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "Atualizar lista"
@@ -11543,45 +13317,32 @@ msgstr "Atualizar lista"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, 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
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Exclui a tarefa"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, 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
+#: ui/evolution-tasks.xml.h:12
 #, 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"
+msgid "Tasks Settings..."
 msgstr "_ConfiguraГУes"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Task"
 msgstr "Tarefa"
@@ -11620,186 +13381,167 @@ msgstr "Remove este atalho da barra de atalhos"
 msgid "Create a new folder"
 msgstr "Criando nova pasta"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Exclui este item"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Exibir uma pasta diferente"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "Sai_r"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "Primeiros passos"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Importar um formato de arquivo externo"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Mover %s para a esquerda"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "_Abrir em uma nova janela"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Exibir informaГЦo sobre o Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Enviar relatСrio de erro"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "Enviar relatСrio de _erro"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar relatСrio de erro usando o Bug Buddy."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Alternar a exibiГЦo da barra de pastas"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Alternar a exibiГЦo da barra de atalhos"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 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:35
-msgid "Using the _Calendar"
-msgstr "Usando a _agenda"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "Usando o _correio"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Visualizar a pasta selecionada"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Sobre o Evolution"
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Compromisso (FIXME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Contato (FIXME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "_Copiar"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Pasta"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "_Importar arquivo..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "_Indexar"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "_Mensagem de correio"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "Mover"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova pasta virtual"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Substituir..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 #, 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
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Trabalhando"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "Mudar a visualizaГЦo para %s"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
-msgstr "_Sobre o Evolution"
+msgid "Print summary"
+msgstr "Sem resumo"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Lida"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "ConfiguraГУes do Executive Summary..."
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
@@ -11841,6 +13583,30 @@ msgstr "_Mensagem"
 msgid "With Category"
 msgstr "Categoria:"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Selecionar nome de:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "SeГУes:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Fuso horАrio: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11848,10 +13614,6 @@ msgstr "Categoria:"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Ocupado"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Fora do escritСrio"
@@ -11925,7 +13687,7 @@ msgstr "Todos os participantes"
 msgid "_Current View"
 msgstr "o instante atual"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11935,19 +13697,20 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr "STQQSSD"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Hoje"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -12035,39 +13798,35 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "Editor de contatos"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 #, fuzzy
 msgid "Save Search"
 msgstr "Buscar"
 
-#: widgets/misc/e-filter-bar.c:241
+#: widgets/misc/e-filter-bar.h:94
 #, fuzzy
-msgid "Advanced Search"
-msgstr "AvanГado"
+msgid "Add to Saved Searches"
+msgstr "Buscar"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "_Limpar"
 
 #: 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"
@@ -12088,10 +13847,15 @@ msgstr "_Mensagem"
 msgid "Don't show this message again."
 msgstr "Enviar esta mensagem agora"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_Buscar"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "Vincular DN:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -12117,6 +13881,284 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "NЦo foi possМvel iniciar Bonobo"
 
 #, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Resumo"
+
+#~ msgid "LDAP Server"
+#~ msgstr "Servidor LDAP"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Tipo de catАlogo de endereГos desconhecido"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Nenhum (modo anТnimo)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Tipo de autenticaГЦo desconhecido"
+
+#~ msgid "Subtree"
+#~ msgstr "SubАrvore"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Tipo de escopo desconhecido"
+
+#~ msgid "Root DN:"
+#~ msgstr "DN raiz:"
+
+#~ msgid "Authentication:"
+#~ msgstr "AutenticaГЦo:"
+
+#, fuzzy
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "FIXME: o que vai aqui?"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Criar caminho se ele nЦo existir."
+
+#~ 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."
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Entre senha para %s"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "Nome contИm"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "Selecionar nome de:"
+
+#~ msgid "USA"
+#~ msgstr "EUA"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Cancelada"
+
+#~ msgid "Transparent"
+#~ msgstr "Transparente"
+
+#~ msgid "Opaque"
+#~ msgstr "Opaco"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Soe um bip quando janelas de alarme aparecerem."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "PreferЙncias da agenda"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "OpГУes do navegador de datas"
+
+#~ msgid "Defaults"
+#~ msgstr "PadrУes"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Lembre-me de todos os compromissos"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minutos antes que ocorram."
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Selecionar nome de:"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Nenhum"
+
+#~ msgid "Task"
+#~ msgstr "Tarefa"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Cu_mprida:"
+
+#~ msgid "Transparency"
+#~ msgstr "TransparЙncia"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Este arquivo existe mas nЦo И legМvel."
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "A pasta aparenta estar corrompida de modo irrecuperАvel."
+
+#~ msgid "All"
+#~ msgstr "Todos"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Armazenar busca como pasta virtual"
+
+#, fuzzy
+#~ msgid "Resend"
+#~ msgstr "segundo"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Gerenciador de contas do Evolution"
+
+#, fuzzy
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "Em %s, %s escreveu:\n"
+
+#, fuzzy
+#~ msgid "Receiving"
+#~ msgstr "Recebendo mensagem"
+
+#~ msgid "Store"
+#~ msgstr "RepositСrio"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Exibir pastas comeГando com:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "Obtendo repositСrio para \"%s\""
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "InstalaГЦo do Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %e de %B de %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Falhou a impressЦo da mensagem"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Novo contato"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "Co_ntatos"
+
+#~ msgid "Go to present time"
+#~ msgstr "Ir para o presente"
+
+#, fuzzy
+#~ msgid "Print this Calendar"
+#~ msgstr "Imprimir esta agenda"
+
+#, fuzzy
+#~ msgid "W_ork Week"
+#~ msgstr "Semana Зtil"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Fechar este compromisso"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "Configurar impressЦo..."
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Salva o compromisso e fecha a caixa de diАlogo"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "_AГУes"
+
+#~ msgid "Help"
+#~ msgstr "Ajuda"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "E_nviar o contato a outro..."
+
+#~ msgid "See online help"
+#~ msgstr "Ver ajuda on-line"
+
+#, fuzzy
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Gerenciar assinaturas..."
+
+#, fuzzy
+#~ msgid "Show _All"
+#~ msgstr "Exibir todos"
+
+#, fuzzy
+#~ msgid "Print Message..."
+#~ msgstr "Imprimir mensagem..."
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "Visualizar impressЦo"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "_Editar mensagem"
+
+#, fuzzy
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Personalizar barras de ferramentas"
+
+#~ msgid "Customize"
+#~ msgstr "Personalizar"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Personalizar barras de ferramentas"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Exclui a tarefa"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Salvar tarefa como outra coisa"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Primeiros passos"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Usando o gerenciador de _contatos"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Usando a _agenda"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Usando o _correio"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Compromisso (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contato (FIXME)"
+
+#~ msgid "_Index"
+#~ msgstr "_Indexar"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Mensagem de correio"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tarefa (FIXME)"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "_Sobre o Evolution"
+
+#, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Mudar preferЙncias"
 
@@ -12130,12 +14172,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ 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"
@@ -12196,9 +14232,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ msgid "About..."
 #~ msgstr "Sobre..."
 
-#~ msgid "C_lear"
-#~ msgstr "_Limpar"
-
 #~ msgid "Dump XML"
 #~ msgstr "Descarregar XML"
 
@@ -12208,9 +14241,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ 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..."
 
@@ -12244,9 +14274,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ 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..."
 
@@ -12280,9 +14307,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ msgid "FIXME: Script _Debugger"
 #~ msgstr "FIXME: _Depurador de scripts"
 
-#~ msgid "FIXME: Task _Request"
-#~ msgstr "FIXME: _Pedido de tarefa"
-
 #~ msgid "FIXME: _Appointment"
 #~ msgstr "FIXME: _Compromisso"
 
@@ -12409,9 +14433,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ msgid "_Undo"
 #~ msgstr "_Desfazer"
 
-#~ msgid "Synchronize"
-#~ msgstr "Sincronizar"
-
 #~ msgid "Copy From Pilot"
 #~ msgstr "Copiar a partir do pilot"
 
@@ -12576,9 +14597,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ msgid "Overdue Items:"
 #~ msgstr "Tarefas atrasadas"
 
-#~ msgid "TaskPad"
-#~ msgstr "Tarefas"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Tempo atИ o prazo"
 
@@ -12615,21 +14633,12 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ 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"
 
@@ -12668,8 +14677,8 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ "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."
+#~ "autenticaГЦo. Isto deve ser adequado para conectar Ю maioria dos "
+#~ "servidores SMTP."
 
 #~ msgid "Inline attachment"
 #~ msgstr "Anexo embutido"
@@ -12721,24 +14730,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ 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"
 
@@ -12773,9 +14764,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ msgid "Mail Account"
 #~ msgstr "Conta de correio"
 
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Assitente de configuraГЦo de correio"
-
 #~ msgid "Miscellaneous"
 #~ msgstr "Diversos"
 
@@ -12801,8 +14789,8 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ "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\"."
+#~ "Digite o nome com o qual deseja identificar estes servidores. Por "
+#~ "exemplo: \"Trabalho\" ou \"Casa\"."
 
 #~ msgid ""
 #~ "Failed to verify the incoming mail configuration.\n"
@@ -12879,9 +14867,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ 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)"
 
@@ -12966,9 +14951,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ msgid "_Print Contacts..."
 #~ msgstr "_Imprimir contatos..."
 
-#~ msgid "5 Days"
-#~ msgstr "5 dias"
-
 #~ msgid "Ca_lendar"
 #~ msgstr "A_genda"
 
@@ -12987,9 +14969,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ msgid "_Open Calendar"
 #~ msgstr "_Abrir agenda"
 
-#~ msgid "_Print this calendar"
-#~ msgstr "_Imprimir esta agenda"
-
 #~ msgid "FIXME: _New Appointment"
 #~ msgstr "FIXME: _Novo compromisso"
 
@@ -13002,9 +14981,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ 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"
 
@@ -13044,9 +15020,6 @@ msgstr "NЦo foi possМvel iniciar Bonobo"
 #~ msgid "_Print Message"
 #~ msgstr "_Imprimir mensagem"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "_Salvar mensagem como..."
-
 #~ msgid "_Threaded"
 #~ msgstr "_Encadeado"
 
diff --git a/po/ro.po b/po/ro.po
index 0934cdffda..b46adc753e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,10 +3,11 @@
 # Tiberiu Micu <tibimicu@gmx.net>, 2001
 # (sponsored by Marius Andreiana <mandreiana@yahoo.com>)
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.12\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: RomБnЦ <ro@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +22,11 @@ msgstr "Procesator pentru  importul fi╨ierelor GnomeCard in Evolution"
 msgid "Imports VCard files into Evolution."
 msgstr "Import fi╨ierele card V Нn Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Card: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +34,7 @@ msgstr ""
 "\n"
 "Nume: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +42,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -49,7 +50,7 @@ msgstr ""
 "\n"
 "  Dat:        "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -57,7 +58,7 @@ msgstr ""
 "\n"
 "  Suplimentar:  "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -65,7 +66,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -73,7 +74,7 @@ msgstr ""
 "\n"
 "  Sufix:      "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -81,7 +82,7 @@ msgstr ""
 "\n"
 "Data na╨terii:"
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -89,7 +90,7 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -97,7 +98,7 @@ msgstr ""
 "\n"
 "  CЦsuЧa po╨talЦ:"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -105,7 +106,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -113,7 +114,7 @@ msgstr ""
 "\n"
 "  Strada:      "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -121,7 +122,7 @@ msgstr ""
 "\n"
 "  Ora╨:        "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -129,7 +130,7 @@ msgstr ""
 "\n"
 "  Regiunea:    "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -137,7 +138,7 @@ msgstr ""
 "\n"
 "  Cod po╨tal:  "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -145,7 +146,7 @@ msgstr ""
 "\n"
 "  чara:        "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -153,7 +154,7 @@ msgstr ""
 "\n"
 "Eticheta de livrare:"
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -161,7 +162,7 @@ msgstr ""
 "\n"
 "Telefoane:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -169,7 +170,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -177,7 +178,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -185,7 +186,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -193,25 +194,25 @@ msgstr ""
 "\n"
 "Program de mail:"
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -219,7 +220,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -227,7 +228,7 @@ msgstr ""
 "\n"
 "  Nume:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -235,7 +236,7 @@ msgstr ""
 "\n"
 "  Unitate:"
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -243,7 +244,7 @@ msgstr ""
 "\n"
 "  Unitate2:"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -251,7 +252,7 @@ msgstr ""
 "\n"
 "  Unitate3:"
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -259,7 +260,7 @@ msgstr ""
 "\n"
 "  Unitate4"
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -267,7 +268,7 @@ msgstr ""
 "\n"
 "Categorii:  "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -285,7 +286,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -293,7 +294,7 @@ msgstr ""
 "\n"
 "╙ir unic:      "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -314,8 +315,8 @@ msgstr "Card V pentru %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -330,20 +331,20 @@ msgstr "Nu pot НncЦrca cursorul\n"
 msgid "EBook not loaded\n"
 msgstr "EBook neНncЦrcat\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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:655
+#: addressbook/conduit/address-conduit.c:663
 #: 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:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -391,195 +392,204 @@ msgstr "Procesator pentru componentele agendei Evolution."
 msgid "Factory for the sample Addressbook control"
 msgstr "Procesator pentru controlul mostrЦ agendЦ"
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Server LDAP"
-
-#: 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
+msgstr "Contacte"
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "FЦrЦ (mod anonim)"
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Eroare la Нncarcarea informaЧiei de filtrare:\n"
+"%s"
 
-#: 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-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Contact nou"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Tip de autorizare necunoscut"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Contact nou"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Baza"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Contact nou"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Unu"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Contact nou"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Subarbore"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Editare agendЦ"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "LegЦtura DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Text ajutor pentru legЦtura DN"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Cont"
 
-#. 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.glade.h:3
+msgid "Add Addressbook"
+msgstr "AdЦugare agendЦ"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "GazdЦ:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Surse agendЦ"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Text ajutor gazdЦ"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Avansat..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "RЦdЦcina DN"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Baza"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Text ajutor rЦdЦcina DN"
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Baze"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Port:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "De_lete"
+msgstr "╙terge"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Text ajutor port"
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "Unu"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 msgstr "Domeniu 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 "OpЧiuni avansate LDAP "
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
-msgstr "Cale:"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Domeniu cЦutare:"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Text ajutor cale"
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "SelecЧie nume"
 
-#: 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.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Du"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "Editare agendЦ"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "AdЦugare agendЦ"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"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 "FIXME Text ajutor descriere"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Surse agendЦ"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "De_lete"
-msgstr "╙terge"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr "Nume"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
-msgstr "URI"
+#: addressbook/gui/component/addressbook-config.glade.h:21
+#, fuzzy
+msgid "_Account name:"
+msgstr "Management cont"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_AdaugЦ"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_EditeazЦ"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Serverul necesitЦ autentificare"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Mesaj server:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 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:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "VЦ rog introduceЧi parola pentru %s"
+
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Autentificare"
+
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "Adresa email:"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Parola"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Nu pot deschide agenda"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -589,7 +599,7 @@ msgstr ""
 "cЦ aЧi introdus URI incorect, sau serverul LDAP\n"
 "e cЦzut"
 
-#: addressbook/gui/component/addressbook.c:385
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -601,7 +611,7 @@ msgstr ""
 "programul din sursele CVS dupЦ ce descЦrcaЧi OpenLDAP urmБnd\n"
 "legЦtura urmЦtoare.\n"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -609,41 +619,67 @@ msgstr ""
 "Nu pot deschide aceastЦ agendЦ. VЦ rog verificaЧi dacЦ existЦ calea\n"
 "╨i daca aveЧi drepturi de acces."
 
-#: addressbook/gui/component/addressbook.c:554
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Orice cБmp conЧine"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Numele conЧine"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "Email-ul conЧine"
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Category contains"
-msgstr "Categoria conЧine"
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
+#, fuzzy
+msgid "Category is"
+msgstr "Categorii"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avansat..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Categorie:"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "URI pe care navigatorul dosarelor Нl va afi╨a"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(FЦrЦ nume)"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "Email 3"
 
@@ -665,19 +701,19 @@ msgstr "AdaugЦ adresa la contactul existent \"%s\""
 msgid "Querying Addressbook..."
 msgstr "CЦutare agendЦ..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Editare informaЧii contact"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "AdaugЦ la contacte"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "Reune╨te adresele email:"
 
@@ -698,13 +734,10 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Procesator interfaЧa de selectare nume a agendei"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:630
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "╙terge"
 
@@ -716,35 +749,55 @@ msgstr "╙terge tot"
 msgid "Send HTML Mail?"
 msgstr "Trimit mail HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Destinatari mesaj"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "conЧine"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "SelecЧie nume"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "Contacte"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "SelecЧie nume din dosar:"
+#, fuzzy
+msgid "F_ind"
+msgstr "GЦse╨te:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "SelecЧie nume"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 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/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "Dosar"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Destinatari mesaj"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -759,8 +812,8 @@ msgid "Business _Fax"
 msgstr "_Fax serviciu"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorii..."
 
@@ -769,16 +822,16 @@ msgid "Contact Editor"
 msgstr "Editor de contacte"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Detalii"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Fi╨ier ca:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "General"
 
@@ -802,239 +855,1243 @@ msgstr "Tipuri de telefon"
 msgid "Wants to receive _HTML mail"
 msgstr "DoriЧi sa primiЧi mail-uri _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Adresa paginii de web:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Adresa..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "Nume _asistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "Ziua de na╨tere:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "Serviciu"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contacte..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_╙terge"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Departament:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Nume complet..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_AcasЦ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_FuncЧia:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "_Nume manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "PoreclЦ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "Birou:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Profesie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_SoЧ/soЧie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_Aceasta este adresa de expediere"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Adresa paginii de web:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "╙terg persoana de contact?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "AceastЦ persoanЦ de contact aparЧine categoriilor:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Serviciu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Serviciu 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Fax serviciu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Rechemare"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Ma╨inЦ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Companie"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Adresa de acasЦ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Adresa de acasЦ 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax acasЦ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Alte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Alt Fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Nu pot ╨terge dosarul sumar al fi╨ierelor `%s': %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Contact AdЦugare-RapidЦ"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Editare completЦ"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Nume complet"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "E-mail"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresa _2"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Asistent"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Automat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Orientare"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "August"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "ani"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "MЦrime"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Trimit"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "GrindinЦ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Scaun"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "VerificЦ adresa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Chinez"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Chinez"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Culori"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Copiez"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "чara"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finlanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "SUA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "RenunЧЦ"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "Grec"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finlanda"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "General"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "GrindinЦ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "ore"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "DuminicЦ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#, fuzzy
+msgid "Ireland"
+msgstr "Corean"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+#, fuzzy
+msgid "Japan"
+msgstr "Japonez"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#, fuzzy
+msgid "Jordan"
+msgstr "Corean"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Cea mai scЦzutЦ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Cea mai scЦzutЦ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+msgid "Liberia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#, fuzzy
+msgid "Lithuania"
+msgstr "GrindinЦ u╨oarЦ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Martie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Mail"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Mail"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Mail"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Margini"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Mai"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Luni"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Mobil"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Manager"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Mail nou"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Selec_teazЦ НnlЦnЧuirea"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Contact nou"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Mail nou"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Mai mare"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "Mai mare"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minut"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Acum"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Lipe╨te"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "HНrtie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finlanda"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Portret"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "dupЦ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Regiuni"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Fum"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "General"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "Program"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Ploaie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Dum"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "PoreclЦ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finlanda"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "VЦzut"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Ploaie"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Lista de sarcini"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finlanda"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "La"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "AstЦzi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Mar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Turc"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ucrainean"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "(Mesaj fЦrЦ titlu)"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "SelecЧie nume"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#, fuzzy
+msgid "Western Sahara"
+msgstr "Europa de vest"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "VЦzut"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "Lo_calitate:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "CЦsuЧa _po╨talЦ:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Stat/Provincie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "Cod po╨tal:"
 
@@ -1124,6 +2181,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "Ascund adresele cБnd trimiteЧi mail la aceastЦ listЦ"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "╙te_rge"
 
@@ -1132,7 +2190,7 @@ msgid "contact-list-editor"
 msgstr "editor-lista-contact"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 msgid "Contact List Editor"
 msgstr "Editor lista de contacte"
 
@@ -1141,7 +2199,7 @@ msgid "Add Anyway"
 msgstr "Adaug oricum"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: 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:4
 msgid "Duplicate Contact Detected"
 msgstr "DubleazЦ contactul detectat"
 
@@ -1162,14 +2220,19 @@ msgstr ""
 "Нn acest dosar. DoriЧi sЦ continuaЧi Нn acest caz?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Change Anyway"
+msgstr "SchimbЦ oricum"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "Contact Нn conflict:"
 
-#: 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:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1177,13 +2240,13 @@ msgstr ""
 "Emailul modificat sau numele acestui contact existЦ deja\n"
 "Нn acest dosar. DoriЧi sЦ continuaЧi Нn acest caz?"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
-#, fuzzy
-msgid "_Change Anyway"
-msgstr "SchimbЦ oricum"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "CЦutare avansatЦ"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "CautЦ"
 
@@ -1295,42 +2358,52 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "SalveazЦ ca ╨i card V"
 
-#: 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:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Deschide"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "нnainteazЦ _anexat"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "TipЦre╨te"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "╙terg"
 
@@ -1345,7 +2418,8 @@ msgid "Success"
 msgstr "Succes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Eroare necunoscutЦ"
 
@@ -1353,7 +2427,7 @@ msgstr "Eroare necunoscutЦ"
 msgid "Repository offline"
 msgstr "Depozitare offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Acces interzis"
 
@@ -1370,8 +2444,12 @@ msgid "Protocol not supported"
 msgstr "Protocol nesuportat"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-msgid "Canceled"
-msgstr "Anulat"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
+msgstr "Revocat"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Other error"
@@ -1394,131 +2472,131 @@ msgid "Error removing list"
 msgstr "Eroare la ╨tergerea listei"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr "Eroare ╨tergere card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Clic aici sЦ adЦugaЧi un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Fi╨ier ca"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Telefon principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Telefon asistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Telefon serviciu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "Telefon revenire"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Telefon companie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Telefon acasЦ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "OrganizaЧie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Adresa serviciu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Adresa acasЦ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Telefon ma╨inЦ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Telefon serviciu 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Telefon acasЦ 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Alt telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "AltЦ adresЦ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Site web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Departament"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Birou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Titlu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Profesie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "PoreclЦ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "SoЧ/soЧie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "NotЦ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "URL liber-ocupat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "Gata."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr "╙tergere card-uri..."
 
@@ -1714,6 +2792,23 @@ msgstr "LЦЧime:"
 msgid "_Font..."
 msgstr "Font..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "TipЦre╨te calendar"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "TipЦre╨te calendar"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "TipЦre╨te plic"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1868,7 +2963,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "Nu pot iniЧializa GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 msgid "Could not initialize gnome-vfs"
 msgstr "Nu pot iniЧializa gnome-vfs"
 
@@ -1876,149 +2971,140 @@ msgstr "Nu pot iniЧializa gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarmЦ"
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %d %B %Y"
 
-#: calendar/gui/calendar-commands.c:586
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/calendar-commands.c:604
 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:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "Public"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "ConfidenЧial"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "Public"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "W"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Ridicat"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "ScЦzut"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "Grec"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Ocupat"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Nepornit"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "нn derulare"
 
-#: 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Terminat"
 
-#: 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 "Revocat"
-
 #. 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2029,29 +3115,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:981
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-"Clasificarea trebuie sЦ fie 'Public', 'Privat', 'ConfidenЧial' sau "
-"'Neclasificat'"
-
-#. 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 "Inexistent"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2061,43 +3125,49 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 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:1168
+#: calendar/gui/calendar-model.c:1092
 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:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Nedefinit"
 
-#: 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'."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Inexistent"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "Alocat"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Nu"
 
@@ -2117,27 +3187,83 @@ msgstr "Afi╨are sЦptamБnЦ"
 msgid "Month View"
 msgstr "Afi╨are lunЦ"
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "Rezumatul conЧine"
+
+#: calendar/gui/cal-search-bar.c:57
+msgid "Description contains"
+msgstr "Descrierea conЧine"
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "Comentariul conЧine"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Calendar"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Sarcini"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Dosar V Нn lista de mail"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "CreazЦ o НntНlnire nouЦ"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "нntБlnire nouЦ"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "CreazЦ o sarcinЦ nouЦ"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "SarcinЦ nouЦ"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URI afi╨at de calendar"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr "OpЧiuni alarmЦ audio"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr "OpЧiuni mesaje alarmЦ"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr "OpЧiuni alarmЦ mail"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr "OpЧiuni alarmЦ program"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr "OpЧiuni alarmЦ necunoscute"
 
@@ -2185,109 +3311,115 @@ msgstr "ore"
 msgid "minutes"
 msgstr "minute"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr "%d zile"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 zi"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d sЦptЦmНni"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 sЦptЦmНnЦ"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d ore"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 orЦ"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d minute"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 minut"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d secunde"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 secundЦ"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "RedЦ un sunet"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Afi╨eazЦ un mesaj"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "RuleazЦ un program"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Necunoscut"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 msgid "before start of appointment"
 msgstr "Нnainte de Нnceperea НntБlnirii"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 msgid "after start of appointment"
 msgstr "dupЦ Нnceperea НntБlnirii"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 msgid "before end of appointment"
 msgstr "Нnainte de sfНr╨itul НntБlnirii"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr "Baze"
 
 #: 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/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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Cuprins:"
 
@@ -2295,12 +3427,11 @@ msgstr "Cuprins:"
 msgid "_Options..."
 msgstr "_OpЧiuni..."
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "dupЦ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "Нnainte"
 
@@ -2317,7 +3448,7 @@ msgstr "sfБr╨it НntБlnire"
 msgid "hour(s)"
 msgstr "ora"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minut(e)"
 
@@ -2334,194 +3465,227 @@ msgid "10 minutes"
 msgstr "10 minute"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 ore (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minute"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 ore"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minute"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minute"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "SetЦri _mail..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr "Culoare pentru sarcinile НntБrziate"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Beep cНnd apare fereastra alarmei."
+msgid "Color for tasks due today"
+msgstr "Culoare pentru sarcinile de astЦzi"
 
 #: 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"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "CreazЦ o НntНlnire nouЦ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "PreferinЧe calendar"
+#, fuzzy
+msgid "Days"
+msgstr "Zi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr "Culoare pentru sarcinile НntБrziate"
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Prima zi a sЦptЦminii:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr "Culoare pentru sarcinile de astЦzi"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "Vineri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr "Culoare pentru sarcini"
+#, fuzzy
+msgid "Hours"
+msgstr "ore"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
-msgstr "ComprimЦ weekend-urile la afi╨area lunii"
+#, fuzzy
+msgid "Minutes"
+msgstr "minute"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
-msgstr "Data navigator"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Luni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Implicit"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Sarcini НntБrziate"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "Afi╨eazЦ"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "SБmbЦtЦ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Sfir╨it zi:"
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr ""
+"AratЦ termenul de final al НntБlnirilor la afi╨area sЦptЦmБnii ╨i lunii"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "Prima zi a sЦptЦminii:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "AratЦ numЦrul de sЦptЦmБni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Vin"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "нnceput zi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Vineri"
+#, fuzzy
+msgid "Su_n"
+msgstr "Dum"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "DuminicЦ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "Lun"
+#, fuzzy
+msgid "T_hu"
+msgstr "Joi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Luni"
+#, fuzzy
+msgid "T_ue"
+msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr "OpЧiuni noficare"
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Sarcini pentru azi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
-msgstr "Sarcini НntБrziate"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Joi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Aminte╨te-mi toate НntБlnirile"
+msgid "Time"
+msgstr "Timp"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr "Zona temporalЦ:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "SБm"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Diviziuni de timp:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "SБmbЦtЦ"
+msgid "Time format:"
+msgstr "Format timp:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Show appointment end times in week and month views"
-msgstr ""
-"AratЦ termenul de final al НntБlnirilor la afi╨area sЦptЦmБnii ╨i lunii"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "MarЧi"
 
 #: 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/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Miercuri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "нnceput zi:"
+#: ui/evolution-calendar.xml.h:33
+msgid "Work Week"
+msgstr "SЦptЦmБna de lucru"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "Dum"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 ore (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "DuminicЦ"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 ore"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Task List"
-msgstr "Lista de sarcini"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
-msgstr "Sarcini pentru azi"
+#, fuzzy
+msgid "_Compress weekends in month view"
+msgstr "ComprimЦ weekend-urile la afi╨area lunii"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "Joi"
+#, fuzzy
+msgid "_Display"
+msgstr "Afi╨eazЦ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Joi"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Sfir╨it zi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Time"
-msgstr "Timp"
+#, fuzzy
+msgid "_Fri"
+msgstr "Vin"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Diviziuni de timp:"
+#, fuzzy
+msgid "_General"
+msgstr "General"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Format timp:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Ascunde mesajele ╨terse"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Time zone:"
-msgstr "Zona temporalЦ:"
+#, fuzzy
+msgid "_Mon"
+msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "Mar"
+#, fuzzy
+msgid "_Other"
+msgstr "Alte"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "MarЧi"
+#, fuzzy
+msgid "_Sat"
+msgstr "SБm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "Mie"
+#, fuzzy
+msgid "_Task List"
+msgstr "Lista de sarcini"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Miercuri"
+#, fuzzy
+msgid "_Wed"
+msgstr "Mie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Work Week"
-msgstr "SЦptЦmБna de lucru"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "minute Нnainte de a avea loc."
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr "Нnainte de Нnceperea НntБlnirii"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2585,61 +3749,56 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nu aЧi fЦcut modificЦri, actualizaЧi editorul?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr " la "
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (Terminat "
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Terminat "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "EditeazЦ НntБlnire"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "нntБlnire - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Sarcina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Intrare jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Nu existЦ rezumat"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 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
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2647,12 +3806,12 @@ 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "SalveazЦ ca..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr "Nu pot obЧine versiunea curentЦ!"
 
@@ -2698,42 +3857,35 @@ msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi task-ul `%s'?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi %d intrЦri din jurnal?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr "Selectez ora localЦ"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "SelecЧie"
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#, fuzzy
+msgid "Addressbook..."
+msgstr "AgendЦ"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Ore locale"
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#, fuzzy
+msgid "Delegate To:"
+msgstr "Delegat la:"
 
-#: 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 ""
-"FolosiЧi butonul din stБnga al mausului pentru a mЦri o zonЦ de pe hartЦ ╨i "
-"selectaЧi ora localЦ.\n"
-" FolosiЧi butonul din dreapta al mausului pentru a mic╨ora."
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#, fuzzy
+msgid "Enter Delegate"
+msgstr "╙terse"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "нntБlnire"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Reaminte╨te"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Revenire"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr "нntБlnire"
 
@@ -2741,173 +3893,189 @@ msgstr "нntБlnire"
 msgid "A_ll day event"
 msgstr "Eveniment zi_lnic"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Ocupat"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Clasificare"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "ConfidenЧial"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Data & Ora"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "Grec"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Ploaie torenЧialЦ"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "Rezu_mat:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_ConfidenЧial"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "Ora d_e sfБr╨it"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "Ora de Нnceput"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "Nume grup:"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "SursЦ"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 msgid "Chair"
 msgstr "Scaun"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "Participant necesar"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Participant opЧional"
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "Neparticipant"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 msgid "Needs Action"
 msgstr "Selectez o acЧiune"
 
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "TentativЦ"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "╙terse"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "нn derulare"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Participant necesar"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Participant opЧional"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Neparticipant"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 msgid "Sent By:"
 msgstr "Trimis de:"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 msgid "_Delegate To..."
 msgstr "_Delegat la..."
 
@@ -2944,19 +4112,18 @@ 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
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: 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 "Organizator:"
@@ -2999,13 +4166,14 @@ msgstr "Нn"
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr "apariЧii"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
-msgstr "Revenire personalЦ"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "A_dd"
+msgstr "AdaugЦ"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3016,25 +4184,32 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "RegulЦ revenire"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Revenire simplЦ"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Revenire personalЦ"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "_ModificЦ"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Nici o revenire"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Revenire simplЦ"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "pentru"
@@ -3079,163 +4254,162 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr "Intrarea Нn jurnal a fost schimbatЦ. Trimit o versiune actualizatЦ?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "Date Completed:"
-msgstr "нntБlnire НncheiatЦ:"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-msgid "Delegated From:"
-msgstr "Delegat de la:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Terminat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Delegated To:"
-msgstr "Delegat la:"
+msgid "Date Completed:"
+msgstr "нntБlnire НncheiatЦ:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-msgid "No one"
-msgstr "Nimeni"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "нn desfЦ╨urare"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "SarcinЦ"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_Prioritate:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Terminat:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Stare"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "нn desfЦ╨urare"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Alocat"
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descriere:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Data de Нnceput:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_ConfidenЧial"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Data scadentЦ:"
 
-#: calendar/gui/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
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "Deschide"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Dec_upeazЦ"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_CopiazЦ"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Lipe╨te"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "MarcheazЦ ca terminat"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "╙terg aceastЦ sarcinЦ"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "MarcheazЦ sarcinile ca terminate"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "╙terge sarcinile selectate"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 msgstr "Clic aici sЦ adЦugaЧi o sarcinЦ"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% Terminat"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarme"
@@ -3269,22 +4443,22 @@ msgstr "PoziЧie geograficЦ"
 msgid "Priority"
 msgstr "Prioritate"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Data Нnceput"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Rezumat"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Sortare 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"
@@ -3296,151 +4470,263 @@ msgstr "%02i diviziuni minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3306
-#, fuzzy
-msgid "New _Appointment"
-msgstr "нntБlnire nouЦ"
-
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Eveniment zilnic nou"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "╙terge aceastЦ НntБlnire"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "FЦ aceastЦ apariЧie mutabilЦ"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "╙terge aceastЦ apariЧie"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "╙terge toate apariЧiile"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
-msgstr "Acesta e un eveniment ce poate fi adЦugat Нn calendar."
+#: calendar/gui/e-itip-control.c:617
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "ObЧine ultimele informaЧii despre НntБlnire"
+
+#: calendar/gui/e-itip-control.c:618
+#, fuzzy
+msgid "Meeting Information"
+msgstr "InformaЧie opЧionalЦ"
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "нntБlnire"
 
-#: calendar/gui/e-itip-control.c:697
-msgid "This is a meeting request."
-msgstr "Aceasta e o cerere de НntБlnire."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
-msgstr "Aceasta e o adЦugare (sau mai multe) la o НntБlnire curentЦ."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Ora de sfБr╨it a НntБlnirii:"
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
-msgstr "Aceasta e o cerere pentru ultima informaЧie despre eveniment."
+#: calendar/gui/e-itip-control.c:632
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "ObЧine ultimele informaЧii despre НntБlnire"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "Cerere de НntБlnire (FIXME)"
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
 msgstr "Acesta e un rЦspuns la o cerere de НntБlnire."
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
-msgstr "Aceasta e o revocare a unui eveniment."
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "нntБlnire"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Selectez o acЧiune"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "GЦse╨te Нn mesaj"
 
-#: 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 "Mesajul este neinteligibil."
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
-msgstr "Aceasta e o sarcinЦ ce poate fi adЦugatЦ la calendar."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "InformaЧie"
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
-msgstr "Aceasta e o cerere de sarcinЦ."
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "Panou sarcini"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "a fost dupЦ"
+
+#: calendar/gui/e-itip-control.c:680
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Aceasta e o cerere pentru ultima informaЧie despre sarcinЦ."
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
-msgstr "Acesta e un rЦspuns la o cerere de sarcinЦ."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "Ce_rere task (FIXME)"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "RЦspunde"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:691
+#, fuzzy
+msgid "Task Cancellation"
 msgstr "Aceasta e o anulare a unei sarcini"
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Mesaj calendar"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
 msgstr "Aceasta e informaЧie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "InformaЧie sursЦ"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr "Aceasta e o cerere pentru o informaЧie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
-msgstr "Acesta e un rЦspuns la o cerere liber-ocupat."
+#: calendar/gui/e-itip-control.c:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:834
-msgid "The message does not appear to be properly formed"
-msgstr "Mesajul nu pare a fi formatat corespunzЦtor."
+#: calendar/gui/e-itip-control.c:723
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr "Acesta e un rЦspuns la o cerere liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
-msgstr "Mesajul conЧine numai cererile nesuportate."
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
-msgstr "InformaЧia conЧinutЦ Нn acest ata╨ a fost invalidЦ"
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "TipЦre╨te mesaj"
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nu pot actualiza fi╨ierul calendar!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "нntБlnire НncheiatЦ:"
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nu pot ╨terge elementul din fi╨ierul calendar!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% Terminat"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Date trimise"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3478,44 +4764,27 @@ msgstr "datЦ sfНr╨it"
 msgid "date-start"
 msgstr "datЦ Нnceput"
 
-#: 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:252
-msgid "Category:"
-msgstr "Categorie:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nu pot incЦrca sarcinile Нn `%s'"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 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: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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "НntБlnire nouЦ..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nu pot deschide dosarul Нn `%s'"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda cerutЦ pentru deshiderea `%s' nu e suportatЦ"
@@ -3541,42 +4810,43 @@ msgid "Go To Date"
 msgstr "Mergi la data"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "Go To Today"
+msgstr "Mer_gi la ziua de azi"
+
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Ianuarie"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Iulie"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Iunie"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Martie"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Noiembrie"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Octombrie"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "Septembrie"
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "Mer_gi la ziua de azi"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr "Un organizator trebuie setat."
 
@@ -3732,12 +5002,6 @@ msgstr "Vi"
 msgid "Sa"
 msgstr "SБ"
 
-#: 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:1815
 #, fuzzy
@@ -3774,9 +5038,8 @@ msgid "Print Calendar"
 msgstr "TipЦre╨te calendar"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "PrevizualizeazЦ tipЦrirea"
 
@@ -3788,7 +5051,7 @@ msgstr "TipЦre╨te elementul"
 msgid "Print Setup"
 msgstr "SeteazЦ tipЦrirea"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "De afi╨at URI pentru dosarul sarcini"
 
@@ -3833,6 +5096,103 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+#, fuzzy
+msgid "contains? expects 2 arguments"
+msgstr "Eroare de sintaxЦ la parametri sau argumente"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 "Semnarea e nesuportatЦ de acest cifru"
@@ -3896,6 +5256,7 @@ msgid "Unable to process spool folder"
 msgstr "Nu pot procesa dosarul spool"
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj &d (%d%%)"
 
@@ -3932,7 +5293,7 @@ msgstr "Eroare parsare filtru: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Eroare execuЧie filtru: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Eroare execuЧie filtru cЦutare: %s: %s"
@@ -3959,12 +5320,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(potrivire totalЦ) se cere un singur rezultat"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "ExecutЦ interogare Нn header necunoscut: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tip invalid Нn conЧinutul mesajului, necesar ╨ir"
 
@@ -4079,13 +5440,13 @@ msgid "No plaintext to sign."
 msgstr "Nu existЦ text pentru semnare."
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
@@ -4103,15 +5464,15 @@ msgstr "Nu existЦ text pentru verificare."
 msgid "Couldn't create temp file: %s"
 msgstr "Nu pot crea fi╨ier temp: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "Clic pe icon pentru decriptare."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Nici un destinatar specificat"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr "Nu existЦ textul cifru pentru decriptare."
 
@@ -4146,7 +5507,7 @@ msgid "Connection cancelled"
 msgstr "Conexiune anulatЦ"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nu mЦ pot conecta la %s (port %d): %s"
@@ -4157,7 +5518,7 @@ msgstr "(gazdЦ necunoscutЦ)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "OperaЧia anulatЦ"
 
@@ -4287,42 +5648,69 @@ msgstr "AceastЦ opЧiune vЦ va conecta la server folosind o parolЦ simplЦ."
 msgid "Unknown authentication state."
 msgstr "Stare necunoscutЦ a autentificЦrii."
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Parola"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "SursЦ"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: 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:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necesitЦ o componentЦ nume utilizator"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necesitЦ o componentЦ gazdЦ"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necesitЦ o componentЦ de cale"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "Rezolv: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "E╨ec la cЦutarea numelui: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "E╨ec la cЦutarea gazdei: %s: gazdЦ negЦsitЦ"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "E╨ec la cЦutarea gazdei: %s: motiv necunoscut"
@@ -4335,12 +5723,12 @@ msgstr "Furnizor de email Нn dosar virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pentru citirea mailului ca o interogare a altui set de dosar"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nici un furnizor valid pentru protocolul `%s'"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4386,7 +5774,7 @@ msgstr "E╨ec la decodarea mesajului."
 msgid "Failed to verify certificates."
 msgstr "E╨ec la verificarea certificatului."
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4396,7 +5784,7 @@ msgstr ""
 "Subiect: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4449,61 +5837,61 @@ msgstr "Nu existЦ mesajul: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Nu puteЧi copia mesaje din acest dosar"
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, 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:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comanda IMAP e╨uatЦ: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "RЦspunsul serverului terminat prea repede."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, 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:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, 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:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nu pot crea directorul %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nu pot НncЦrca sumarul pentru %s"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 msgid "Folder was destroyed and recreated on server."
 msgstr "Dosarul a fost distrus ╨i recreat pe server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:437
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Salvez mesajele"
@@ -4517,7 +5905,7 @@ msgstr "Nu pot gЦsi corpul mesajului Нn rЦspunsul FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Nu pot deschide directorul cache: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Verific mailurile noi"
 
@@ -4525,7 +5913,7 @@ msgstr "Verific mailurile noi"
 msgid "Check for new messages in all folders"
 msgstr "Verific mesajele noi Нn toate dosarele"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Dosare"
 
@@ -4564,7 +5952,7 @@ 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:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tip de autentificare nesuportat %s"
@@ -4575,7 +5963,7 @@ 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:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Nu aЧi introdus o parolЦ."
 
@@ -4590,12 +5978,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Nu existЦ dosarul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4685,7 +6073,7 @@ msgstr "Nu pot adЦuga mesajul la dosarul maildir: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4699,7 +6087,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4770,20 +6158,20 @@ msgstr "Nu pot deschide calea cЦtre directorul maildir: %s: %s"
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: 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:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, 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:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4795,12 +6183,12 @@ msgstr ""
 "Nu pot lua mesajul: %s din dosarul %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dosarul pare a fi deteriorat irecuperabil."
 
-#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: 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Ц?"
@@ -4848,13 +6236,14 @@ msgstr "Dosarul `%s' nu e gol. Nu s-a ╨ters."
 #. 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"
+#, fuzzy
+msgid "Summarizing folder"
 msgstr "Rezumare dosar"
 
 #: camel/providers/local/camel-mbox-summary.c:254
 #: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr "Nu pot deschide dosarul: %s: rezumare de la poziЧia %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4864,24 +6253,22 @@ msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Eroare fatalЦ la parserul de mail la poziЧia %ld Нn dosarul %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
 msgstr "Nu pot rezuma dosarul: %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:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Sincronizare dosar"
 
 #: 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"
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "Nu pot deschide dosarul pentru rezumare: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -4984,6 +6371,17 @@ msgstr "Dosarele spool nu pot fi redenumite"
 msgid "Spool folders cannot be deleted"
 msgstr "Dosarele spool nu pot fi ╨terse"
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Nu pot rezuma dosarul: %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Nu pot deschide dosarul pentru rezumare: %s: %s"
+
 #: camel/providers/local/camel-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5077,39 +6475,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Nu pot sЦ deschid sau sЦ creez fi╨ierul .newsrc pentru %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Primesc sumarul POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nu pot verifica mesajele noi pe serverul POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nu pot deschide dosarul: lista de mesaje a fost incompletЦ."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "Nici un mesaj cu uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Primesc mesajul POP %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nu pot aduce mesajul: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nu pot recupera primi de la serverul POP %s: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "Nici un mesaj cu uid %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Primesc mesajul POP %d"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Stocare mesaje"
@@ -5123,7 +6521,7 @@ msgstr "LasЦ mesajele pe server"
 msgid "Delete after %s day(s)"
 msgstr "╙tergere dupЦ %s zi(le)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5217,7 +6615,7 @@ msgid "No such folder `%s'."
 msgstr "Nu existЦ dosarul `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5271,7 +6669,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail trimis prin intermediul programului sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5281,123 +6679,123 @@ msgstr ""
 "Pentru trimiterea mailului prin conectare la un hub de mailuri distant "
 "folosind SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Eroare de sintaxЦ, comandЦ nerecunoscutЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Eroare de sintaxЦ la parametri sau argumente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "ComandЦ neimplementatЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "Parametru al comenzii neimplementat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr "Starea sistemului, sau rЦspuns de ajutor al sistemului"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Mesaj de ajutor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Serviciu pregЦtit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Serviciul Нnchide canalul de transmisie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "Serviciu invalid, canal de transmisie Нnchis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "AcЧiunea cerutЦ de mail terminatЦ cu succes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr "Utilizatorul nu e local: se va Нnainta la <cale-Нnaintare>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 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:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 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:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "AcЧiunea cerutЦ anulatЦ: eroare la procesare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "Utilizatorul nu este local; НncercaЧi vЦ rog <cale-Нnaintare>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "AcЧiunea cerutЦ refuzatЦ: posibilitatea de stocare a sistemului depЦ╨itЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 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:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 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:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 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:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "TranzacЧie e╨uatЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "E nevoie de o tranziЧie a parolei"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "Mecanismul de autenticare este prea slab"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Mecanismul de autentificare cerut necesitЦ criptare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "E╨uare temporarЦ a autentificЦrii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "NecesitЦ autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, 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:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Serverul SMTP %s nu suportЦ tipul cerut de autentificare %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5408,128 +6806,128 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "Server SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail livrat prin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr "Nu pot trimite mesajul: adresa expeditorului nedefinitЦ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalidЦ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Trimit mesaj"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "нntБlnire"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Comanda HELO a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, 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:744
-msgid "Error creating SASL authentication object."
-msgstr "Eroare la crearea obiectului de autentificare SASL"
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr "Eroare la crearea obiectului de autentificare SASL"
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr "E╨ec la cererea AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "RЦspuns de la server: autentificare e╨uatЦ.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, 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:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "DATA rЦspuns de eroare: terminarea mesajului: %s: mesajul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Timp expirat pentru cererea RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RЦspuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Comanda QUIT a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT rЦspuns de eroare: %s: nefatal"
@@ -5559,7 +6957,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "anexЦ"
 
@@ -5592,52 +6990,52 @@ msgstr "Tip MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerez afi╨area automatЦ a anexei"
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Clic aici pentru agendЦ"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "De la:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "RЦspunde la:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "IntroduceЧi destinatarul mesajului"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "IntroduceЧi adresele care vor primi o copie a mesajului"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5668,29 +7066,29 @@ msgstr ""
 "Eroare la citirea fi╨ierului: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "SalveazЦ ca..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr "Avertisment!"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "Fi╨ierul existЦ, suprascriu?"
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fi╨ierului: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la НncЦrcarea fi╨ierului: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5698,16 +7096,16 @@ msgstr ""
 "Nu pot deschide dosarul cu ciorne pentru acest cont.\n"
 "DoriЧi sЦ folosiЧi dosarul cu ciorne implicit?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Eroare la accesarea fi╨ierului: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nu pot primi mesajul de la editor"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5716,7 +7114,7 @@ msgstr ""
 "Nu pot cЦuta Нn fi╨ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5725,7 +7123,7 @@ msgstr ""
 "Nu pot trunchia fi╨ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5734,15 +7132,16 @@ msgstr ""
 "Eroare la salvarea automatЦ a mesajului: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution a gЦsit fi╨iere nesalvate Нntr-o sesiune anterioarЦ.\n"
 "DoriЧi sЦ Нncerc o restaurare?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5751,24 +7150,24 @@ msgstr ""
 "Acest mesaj nu a fost trimis.\n"
 "DoriЧi sЦ salvaЧi modificЦrile?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Deschide fi╨ier"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "InsereazЦ fi╨ier"
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Compune un mesaj"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Nu pot crea fereastra de compunere."
 
@@ -5796,57 +7195,103 @@ msgstr "carte de vizitЦ"
 msgid "calendar information"
 msgstr "informaЧie calendar"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "conЧine"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "nu conЧine"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "Comentariul conЧine"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Numele conЧine"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Descrierea conЧine"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Numele conЧine"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Numele conЧine"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "nu conЧine"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %m/%d/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5854,13 +7299,13 @@ 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:303
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5957,7 +7402,7 @@ msgstr "o orЦ relativЦ la ora curentЦ"
 msgid "Compare against"
 msgstr "ComparЦ faЧЦ de"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "acum"
 
@@ -5969,11 +7414,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<clic aici pentru a selecta o datЦ>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Reguli filtre"
 
@@ -5994,20 +7443,20 @@ msgstr ""
 "Oops, aЧi uitat sЦ alegeЧi un dosar.\n"
 "VЦ rog mergeЧi Нnapoi ╨i precizaЧi un dosar pentru livrarea mailului."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Alege dosar"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Introdu dosar URI"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<clic aici sЦ alegeЧi un dosar>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6028,62 +7477,51 @@ msgstr "Nume regulЦ:"
 msgid "Untitled"
 msgstr "FЦrЦ titlu"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "DacЦ"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "ExecutЦ acЧiunile"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "dacЦ toate criteriile sunt Нndeplinite"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "dacЦ oricare criteriu e Нndeplinit"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "AdaugЦ criteriu"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "intrЦ"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "EditeazЦ filtre"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "EditeazЦ dosare V"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "IntrЦ"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Iese"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Dosare virtuale"
 
@@ -6107,192 +7545,193 @@ msgstr "cu toate dosarele locale ╨i distante active"
 msgid "with all local folders"
 msgstr "cu toate dosarele locale"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
 msgstr "Atribuie culoare"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Atribuie punctaj"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Anexe"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "conЧine"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "CopiazЦ Нn dosar"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Date recepЧionate"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Date trimise"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "╙terse"
 
-#: 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
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Nu existЦ"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "CiornЦ"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "se terminЦ cu"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "ExistЦ"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "existЦ"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Expresie"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Important"
 
-#: 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
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Lista de mail"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Corp mesaj"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "Antet mesaj"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "Mesajul a fost recepЧionat"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "Mesajul a fost trimis"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "MutЦ in dosar"
 
-#: 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
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Cite╨te"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Potrivire regex"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "RЦspuns la"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Punctaj"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Expeditor"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "SeteazЦ starea"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 msgid "Size (kB)"
 msgstr "MЦrime (kB)"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "sunЦ ca"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Cont sursЦ"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Antet specific"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "Нncepe cu"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Subiect"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "conЧine"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "nu conЧine"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "nu se terminЦ cu"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "nu existЦ"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "nu sunЦ ca"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "nu Нncepe cu"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "se terminЦ cu"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "existЦ"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "e mai mare decБt"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "e mai mic decБt"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "nu este"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "este"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "Нn sau dupЦ"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "Нn sau Нnainte"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "sunЦ ca"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "Нncepe cu"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "a fost dupЦ"
@@ -6322,14 +7761,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Import"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Mail"
 
@@ -6357,11 +7795,11 @@ msgstr ""
 "Evolution a gЦsit fi╨iere fi╨iere GnomeCard.\n"
 "DoriЧi sЦ le importaЧi Нn Evolution?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "SetЦri"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6417,166 +7855,187 @@ msgstr "Procesator pentru componenta sumar mail."
 msgid "Mail configuration interface"
 msgstr "InterfaЧa de configurare mail"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Dosar V Нn lista de mail"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "_ProprietЦЧi..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "ModificЦ proprietЦЧile fi╨ierului"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Mesaj _mail"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Mesaj _mail"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nu pot iniЧializa componenta mail Evolution."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "ProprietЦЧi pentru \"%s\""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "ProprietЦЧi"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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 dosar V"
+#: mail/folder-browser.c:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "_CreazЦ filtru din mesaj"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V Нn lista de mail"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "Retrimite"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "TipЦre╨te mesaj..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_SalveazЦ ca..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "Ti_pЦre╨te"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_RЦspunde la expeditor"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "RЦspunde la _listЦ"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "RЦspunde la toЧi"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_нnainteazЦ"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 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
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "MarcheazЦ ca _necitit"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr "MarcheazЦ ca important"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "MarcheazЦ ca important"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "MutЦ Нn dosar..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_CopiazЦ Нn dosarul..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "Rec_upereazЦ"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "AdaugЦ expeditorul Нn agendЦ"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "AplicЦ filtre"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "CreazЦ regulЦ din mesaj"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "Dosar V Нn lista de mail"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtru pe lista de mail (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Dosar V pe lista de mail (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "InformaЧie opЧionalЦ"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Procesator pentru importul mbox Нn Evolution"
@@ -6637,15 +8096,15 @@ msgid "Evolution News Editor"
 msgstr "Editor de ╨tiri Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Editor de conturi Evolution"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "SalveazЦ semnЦtura"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6654,38 +8113,43 @@ msgstr ""
 "AceastЦ semnЦturЦ a fost modificatЦ, dar n-a fost salvatЦ.\n"
 "DoriЧi sЦ salvaЧi modificЦrile?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (implicit)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "InvalideazЦ"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "ValideazЦ"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 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:268
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr "Nu ╨terge"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr "Chiar ╨tergeЧi acest cont?"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi acest cont nou?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Manager de conturi Evolution"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "SetЦri _mail..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6739,11 +8203,11 @@ msgstr ""
 "Trebuie sЦ configuraЧi transportul mailurilor\n"
 "Нnainte pentru a putea compune mailuri. "
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Nu aЧi setat o metodЦ de transport a mailului"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6751,7 +8215,7 @@ msgstr ""
 "Acest mesaj nu are subiect.\n"
 "Chiar trimiteЧi?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6763,38 +8227,37 @@ msgstr ""
 "adЦugarea unui antet Aparent-la.\n"
 "TrimiteЧi oricum?"
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 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:410
+#: mail/mail-callbacks.c:390
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Trebuie sЦ configuraЧi un cont Нnainte pentru a putea sЦ trimiteЧi acest mail"
 
-#: mail/mail-callbacks.c:653
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "нn %s, %s a scris:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Mesaj Нnaintat:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "MutЦ mesaj(e) Нn"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "CopiazЦ mesaje(le) Нn"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "SunteЧi sigur cЦ doriЧi sЦ editaЧi toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6802,7 +8265,7 @@ msgstr ""
 "PuteЧi numai sЦ editaЧi mesajele\n"
 "salvate Нn dosarul Ciorne"
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6810,24 +8273,41 @@ msgstr ""
 "PuteЧi numai sЦ retrimiteЧi mesajele\n"
 "din dosarul Trimise"
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "SunteЧi sigur cЦ doriЧi sЦ retrimiteЧi toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "Nici un mesaj selectat"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "SalveazЦ mesajul ca..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "SalveazЦ mesajele ca..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Avertisment"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Nu mЦ Нntreba din nou"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6836,62 +8316,72 @@ msgstr ""
 "Eroare la Нncarcarea informaЧiei de filtrare:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "_Filtre..."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "TipЦre╨te mesaj"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "TipЦrirea mesajului nereu╨itЦ"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "SunteЧi sigur cЦ doriЧi sЦ deschideЧitoate cele %d mesaje Нn ferestre "
 "separate?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"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
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"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 administratorul "
 "dumneavoastrЦ de sistem sau furnizorul de serviciu Internet."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"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 administratorul dumneavostrЦ "
 "de sistem sau furnizorul de serviciu Internet."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "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 "
@@ -6900,80 +8390,87 @@ msgstr ""
 "doar pentru afi╨are."
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Asistentul de conturi Evolution"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Inbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr "Verific tipurile suportate"
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " culoare"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Semnarea e nesuportatЦ de acest cifru"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Cont"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "InformaЧie cont"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Management cont"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Conturi"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
-msgstr "нntotdeauna НncarcЦ imaginile neconectat"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
+msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "AnexЦ"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Tip de autentificare: "
 
-#: 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:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Compozitor"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6990,273 +8487,252 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva setЦrile"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Default Forward style is: "
 msgstr "Stilul implicit pentru \"нnainteazЦ\" este: "
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+#, fuzzy
+msgid "Default character encoding: "
 msgstr "Setul de caractere implicit: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr "ID-uri digitale..."
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Afi╨eazЦ"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Gata"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Dosar ciorne:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "EditeazЦ..."
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "E_nable"
+msgstr "ValideazЦ"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "Adresa email:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "SalveazЦ fi╨ierul curent cu un nume diferit"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr "Gole╨te dosarul cu reziduuri la ie╨ire"
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "EditeazЦ..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "ValideazЦ"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Nume complet:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Ia ID digital..."
 
-#: mail/mail-config.glade.h:42
-msgid "HTML Signature:"
+#: mail/mail-config.glade.h:35
+#, fuzzy
+msgid "HTML signature file:"
 msgstr "SemnЦturЦ HTML:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr "IlumineazЦ citatele cu "
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "нn mailuri HTML"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "нn linie"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr "нncarcЦ imaginile dacЦ expeditorul e Нn agendЦ"
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "LocaЧie cЦsuЧЦ po╨talЦ"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
-msgstr "FЦ contul acesta contul meu implicit"
-
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "MarcheazЦ mesajele ca \"Citit\" dupЦ"
+msgid "Make this my _default account"
+msgstr "FЦ contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "Server NNTP"
 
-#: mail/mail-config.glade.h:59
-msgid "Never load images off the net"
-msgstr "Nu НncЦrca niciodatЦ imaginile neconectat"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "╙tiri"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "InformaЧie opЧionalЦ"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "OrganizaЧie:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "ID cheie PGP:"
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr "Cale binarЦ PGP:"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Alege o culoare"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Prompt when sending messages with an empty subject"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Prompt when sending messages with an _empty subject"
 msgstr "нntreabЦ-mЦ cБnd trimit mesaje fЦrЦ subiect"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "нntreabЦ-mЦ cБnd trimit mesaje fЦrЦ subiect"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "Cotat"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Primesc email"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "OpЧiuni primire"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr "MemoreazЦ fraza de trecere PGP pНnЦ la ie╨ire"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "InformaЧie cerutЦ"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "MIME securizat"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Securitate"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "SelecteazЦ un fi╨ier"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "SelecteazЦ binarul PGP"
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
-msgstr "Trimite implicit mail Нn format HTML."
-
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Trimit mail"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Trimis"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Trimite ╨i mesajele ciornЦ"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Dosar mesaje trimise:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Configurare server"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "Serverul necesitЦ autentificare"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Fi╨ier semnЦturЦ:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "SursЦ"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "InformaЧie sursЦ"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Surse"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Dosare speciale"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use secure connection (_SSL)"
 msgstr "Folose╨te conectare securizatЦ (SSL)"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Nume utilizator:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7264,15 +8740,124 @@ msgstr ""
 "\n"
 "Clic \"UrmЦtorul\" pentru a Нncepe"
 
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "_Always load images off the net"
+msgstr "нntotdeauna НncarcЦ imaginile neconectat"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "VerificЦ automat dacЦ sunt mailuri noi la fiecare"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr "Verific tipurile suportate"
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "Adresa email:"
+
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Empty trash folders on exit"
+msgstr "Gole╨te dosarul cu reziduuri la ie╨ire"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Nume complet:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "SemnЦturЦ HTML:"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "IlumineazЦ citatele cu "
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "GazdЦ:"
+
+#: mail/mail-config.glade.h:102
+#, fuzzy
+msgid "_Load images if sender is in addressbook"
+msgstr "нncarcЦ imaginile dacЦ expeditorul e Нn agendЦ"
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "MarcheazЦ mesajele ca \"Citit\" dupЦ"
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "Nume:"
+
+#: mail/mail-config.glade.h:106
+#, fuzzy
+msgid "_Never load images off the net"
+msgstr "Nu НncЦrca niciodatЦ imaginile neconectat"
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "OrganizaЧie:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "Cale binarЦ PGP:"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Cale:"
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "_Remember PGP Passphrase until exit"
+msgstr "MemoreazЦ fraza de trecere PGP pНnЦ la ie╨ire"
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Memorez aceastЦ parolЦ"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Trimite implicit mail Нn format HTML."
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Fi╨ier semnЦturЦ:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Nume utilizator:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr "fereastra-╨tiri1"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr "plaseazЦ"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "secunde"
 
@@ -7312,179 +8897,190 @@ msgstr "Nu pot crea un context pentru anvelopa S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nu pot crea contextul pentru decodarea S/MIME."
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "SalveazЦ anexa"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "SalveazЦ pe disc..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Vedere inline"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide Нn %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vedere inline (via %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Ascund"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Vizualizator extern"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "нncarc conЧinut mesaj"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "Deschide legЦtura Нn navigator"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "CopiazЦ legЦtura cЦtre locaЧia"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr "SalveazЦ legЦtura ca (FIXME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "SalveazЦ imaginea ca..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr "%d noi"
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr "%d ascunse"
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "╙terse"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr "%d netrimise"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexЦ"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afi╨ez ca sursЦ."
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adresa email:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De la"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr "RЦspuns-la:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "La"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "Nu e configurat nici un program GPG/PGP."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "Mesaj criptat neafi╨at"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Mesaj criptat"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Clic pe icon pentru decriptare."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 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:1388
+#: mail/mail-format.c:1403
 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:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator cЦtre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, 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:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator cЦtre fi╨ierul local (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator cЦtre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator cЦtre o datЦ externЦ necunoscutЦ (tip \"%s\")"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului parЧial deformat."
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Nu existЦ dosarul %s"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Deschid '%s'"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Schimb dosarul \"%s\" Нn formatul \"%s\""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7493,7 +9089,7 @@ msgstr ""
 "Nu pot salva informaЧia meta a dosarului; probabil cЦ nu veЧi mai putea\n"
 "deschide acest dosar: %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7501,12 +9097,12 @@ msgstr ""
 "DacЦ nu o sЦ puteЧi deschide aceastЦ cЦsuЧЦ po╨talЦ, atunci\n"
 "probabil va trebui sЦ o reparaЧi manual."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nu puteЧi copia mesaje din acest dosar"
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr "ReconfigureazЦ %s"
@@ -7529,104 +9125,129 @@ msgstr ""
 "Eroare Нn timpul operaЧiei:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Memorez aceastЦ parolЦ"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Lucrez"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Actualizez dosarul"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Primesc mail"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Trimit \"%s\""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Trimit mesajul %d din %d"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "E╨ec la mesajul %d din %d"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Terminat"
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "Salvez mesaj Нn dosar"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesajele Нn %s"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesajele Нn %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Mut"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Copiez"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez dosarele Нn \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Gunoi"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Mesaje Нnaintate"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Creez dosar nou"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "╙terg dosarul %s"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Sincronizare dosar"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Primesc mesajul %s"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Primesc mesaje"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvez mesajele"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7635,7 +9256,7 @@ msgstr ""
 "Nu pot crea fi╨ierul de ie╨ire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7644,11 +9265,11 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7657,79 +9278,75 @@ msgstr ""
 "Nu pot crea fi╨ierul de ie╨ire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_CautЦ"
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(Mesaj fЦrЦ titlu)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(Mesaj fЦrЦ titlu)"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "Mesaj"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "GЦse╨te Нn mesaj"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr "CautЦ Нnainte"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "GЦse╨te:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Potriviri:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "RenunЧ..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Trimite & Prime╨te mailul"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Primesc"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "Actualizez..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "A╨tept..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "Trimit"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr "OperaЧie anulatЦ de utilizator."
 
@@ -7748,82 +9365,88 @@ msgstr "Mesaj Нnaintat - %s"
 msgid "Forwarded message"
 msgstr "Mesaje Нnaintate"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Mesaje Нnaintate"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "Dosare V"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "нnaintat: (fЦrЦ subiect)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "Mesaj"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "NevЦzut"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "VЦzut"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "RЦspuns"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nevЦzute multiple"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "Cea mai scЦzutЦ"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Mai scЦzutЦ"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "Mai mare"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "AstЦzi %l:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "Salvez mesajele"
 
 #: mail/message-list.etspec.h:2
@@ -7838,38 +9461,77 @@ msgstr "Primit"
 msgid "Size"
 msgstr "MЦrime"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Dosar"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr ""
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Afi╨eazЦ dosarele НncepБnd cu:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Scanez dosarele Нn \"%s\""
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Scanez dosarele Нn \"%s\""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonare la dosarul \"%s\""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Dezabonare de la dosarul \"%s\""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Dosar"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "Acest eveniment a fost ╨ters."
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "ReНmprospЦteazЦ lista"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Toate dosarele:"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Afi╨eazЦ staЧiile:"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "Administrare abonЦri"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "AboneazЦ"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "DezaboneazЦ"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Componenta Evolution pentru sumarul activitЦЧilor."
@@ -7878,50 +9540,67 @@ msgstr "Componenta Evolution pentru sumarul activitЦЧilor."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Procesator pentru componenta sumar a activitЦЧilor."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Nu pot iniЧializa componenta Evolution pentru sumarul activitЦЧilor."
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "нntБlniri"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 msgid "No appointments"
 msgstr "Nu existЦ НntБlniri"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 msgid "%l:%M%p"
 msgstr "%l:%M%p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "Sumar mail"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Vorba zilei"
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr "Cotele zilei"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr "AdaugЦ o sursЦ de ╨tiri"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "IntroduceЧi URL-ul sursei de ╨tiri pe care o adЦugaЧi"
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Nume:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "SetЦri Evolution..."
+msgid "Summary Settings"
+msgstr "Rezumatul conЧine"
 
 #: my-evolution/e-summary-rdf.c:281
 #, fuzzy
@@ -7932,7 +9611,12 @@ msgstr "S-a produs o eroare la descЦrcarea sursei de ╨tiri</dt>"
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Eroare Нn timpul descЦrcЦrii RDF</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Dosar _nou"
+
+#: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr "Nu existЦ sarcini"
 
@@ -7940,30 +9624,73 @@ msgstr "Nu existЦ sarcini"
 msgid "My Weather"
 msgstr "Vremea"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Serverul pentru vreme nu a putut fi contactat</b></dd>"
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+msgid "Weather"
+msgstr "Vremea"
+
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Regiuni"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
-msgstr "%A, %d %B %Y"
+#, fuzzy
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %d, %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
-msgstr "TipЦre╨te Evolution"
+#, fuzzy
+msgid "Print Summary"
+msgstr "Rezumat"
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
-msgstr "TipЦrirea Evolution nereu╨itЦ"
+#, fuzzy
+msgid "Printing of Summary failed"
+msgstr "TipЦrirea mesajului nereu╨itЦ"
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Componenta sumar a activitЦЧilor nu poate iniЧializa Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Fonturi"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Mut"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Filtre..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Filtre..."
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Cer senin"
@@ -9118,107 +10845,142 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid "Add new feed"
-msgstr ""
+#, fuzzy
+msgid " _Remove"
+msgstr "╙te_rge"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "All folders:"
-msgstr "Toate dosarele:"
+#, fuzzy
+msgid "Add n_ew feed"
+msgstr "AdaugЦ o sursЦ de ╨tiri"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Toate staЧiile:"
 
 #: my-evolution/my-evolution.glade.h:4
-msgid "All stations:"
-msgstr "Toate staЧiile:"
+#, fuzzy
+msgid "All _folders:"
+msgstr "Toate dosarele:"
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "Display folders:"
-msgstr "Afi╨eazЦ dosarele:"
+#: my-evolution/my-evolution.glade.h:5
+#, fuzzy
+msgid "All news _feeds:"
+msgstr "AdaugЦ o sursЦ de ╨tiri"
 
 #: my-evolution/my-evolution.glade.h:7
-msgid "Display stations:"
-msgstr "Afi╨eazЦ staЧiile:"
+msgid "How many days should the calendar display at once?"
+msgstr "CБte zile trebuie sЦ afi╨eze calendarul?"
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "Displayed feeds:"
-msgstr ""
+#, fuzzy
+msgid "Ma_x number of items shown:"
+msgstr "NumЦrul maxim de elemente afi╨ate:"
 
 #: my-evolution/my-evolution.glade.h:9
-msgid "Five days"
-msgstr "Cinci zile"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr "CБte zile trebuie sЦ afi╨eze calendarul?"
+#, fuzzy
+msgid "One mont_h"
+msgstr "O lunЦ"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "O sЦptЦmБnЦ"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
-msgstr "NumЦrul maxim de elemente afi╨ate:"
+#, fuzzy
+msgid "Refresh _time (seconds):"
+msgstr "Durata de actualizare (secunde):"
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "AratЦ toate sarcinile"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "AratЦ sarcilnile de azi"
 
 #: my-evolution/my-evolution.glade.h:15
-msgid "One day"
-msgstr "O zi"
+msgid "Tasks "
+msgstr "Sarcini"
 
 #: my-evolution/my-evolution.glade.h:16
-msgid "One month"
-msgstr "O lunЦ"
+msgid "Units: "
+msgstr "UnitЦЧi: "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "One week"
-msgstr "O sЦptЦmБnЦ"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
-msgstr "Durata de actualizare (secunde):"
+msgid "Weather settings"
+msgstr "SetЦri vreme"
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Schedule"
-msgstr "Program"
+#, fuzzy
+msgid "_Display folders:"
+msgstr "Afi╨eazЦ dosarele:"
 
 #: my-evolution/my-evolution.glade.h:20
-msgid "Show all tasks"
-msgstr "AratЦ toate sarcinile"
+#, fuzzy
+msgid "_Display stations:"
+msgstr "Afi╨eazЦ staЧiile:"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
-msgstr "AratЦ Нntreaga cale pentru dosare"
+#, fuzzy
+msgid "_Displayed feeds:"
+msgstr "Afi╨eazЦ dosarele:"
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "Show today's tasks"
-msgstr "AratЦ sarcilnile de azi"
+#, fuzzy
+msgid "_Five days"
+msgstr "Cinci zile"
 
 #: my-evolution/my-evolution.glade.h:23
-msgid "Tasks "
-msgstr "Sarcini"
+#, fuzzy
+msgid "_Mail"
+msgstr "Mail"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
-msgstr "UnitЦЧi: "
+#, fuzzy
+msgid "_News Feeds"
+msgstr "Dosar _nou"
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "Weather"
-msgstr "Vremea"
+#, fuzzy
+msgid "_One day"
+msgstr "O zi"
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "Weather settings"
-msgstr "SetЦri vreme"
+#, fuzzy
+msgid "_Refresh time (seconds):"
+msgstr "Durata de actualizare (secunde):"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "imperial"
-msgstr ""
+#, fuzzy
+msgid "_Schedule"
+msgstr "Program"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "AratЦ Нntreaga cale pentru dosare"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Vremea"
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "_imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:31
+#, fuzzy
+msgid "m_etric"
 msgstr "metric"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9233,7 +10995,16 @@ msgstr "AratЦ detalii"
 msgid "Cancel Operation"
 msgstr "Anulare operaЧie"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Dosare speciale"
@@ -9288,7 +11059,7 @@ msgstr ""
 "A apЦrut o eroare Нn timpul copierii fi╨ierului Нn\n"
 "`%s'."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9299,7 +11070,7 @@ msgstr ""
 "VЦ rog sЦ-l mutaЧi pentru a permite instalarea\n"
 "fi╨ierelor utilizator Evolution."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9308,7 +11079,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9319,51 +11090,73 @@ msgstr ""
 "VЦ rog sЦ-l mutaЧi pentru a permite instalarea\n"
 "fi╨ierelor utilizator Evolution."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 msgid "Cannot move a folder over itself."
 msgstr "Nu pot muta un dosar peste el Нnsu╨i."
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot copy a folder over itself."
 msgstr "Nu copia un dosar peste el Нnsu╨i."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Nu pot muta un dosar Нntr-unul din descendenЧii sЦi/"
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "PrecizaЧi un dosar pentru a copia dosarul \"%s\" Нn:"
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "CopiazЦ dosarul"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "PrecizaЧi un dosar pentru a muta dosarul \"%s\" Нn:"
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "MutЦ dosarul"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Nu pot ╨terge dosarul `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "╙terge dosarul '%s'"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "SunteЧi sigur cЦ doriЧН sЦ ╨tergeЧi dosarul `%s'?"
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Redenum╨te dosarul '%s'"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+msgid "Rename"
+msgstr "Redenume╨te"
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nume dosar:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9377,7 +11170,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "Numele dosarului specificat este invalid."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Creare dosar nou"
 
@@ -9389,11 +11182,11 @@ msgstr ""
 "Tipul fi╨ierului selectat nu e valid pentru\n"
 "operaЧia cerutЦ."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(FЦrЦ titlu)"
 
@@ -9433,7 +11226,7 @@ msgstr ""
 "Se importЦ %s\n"
 "Se importЦ articol %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9482,7 +11275,7 @@ msgstr "Automat"
 msgid "Filename:"
 msgstr "Nume fi╨ier:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "SelecteazЦ un fi╨ier"
 
@@ -9490,31 +11283,53 @@ msgstr "SelecteazЦ un fi╨ier"
 msgid "File type:"
 msgstr "Tip fi╨ier:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr "AlegeЧi dosarul destinaЧie pentru importul datelor"
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr "нnchid conexiunile..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Nu pot iniЧializa componenta mail Evolution."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 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:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9524,90 +11339,106 @@ msgstr ""
 "pentru mail, calendar ╨i managementul contactelor\n"
 "Нn mediul desktop GNOME"
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Mergi la dosarul..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr "AlegeЧi dosarul pe care doriЧi sЦ-l deschideЧi"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
 msgstr "CreazЦ o scurtЦturЦ nouЦ"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "AlegeЧi dosarul spre care doriЧi sЦ indice scurtЦtura:"
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, 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
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "LucreazЦ deconectat"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Nici un dosar afi╨at)"
 
-#. 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-shell-view.c:1411
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution - %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution este actualmente conectat. DaЧi clic pe buton pentru a lucra "
 "deconectat."
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution este Нn proces de deconectare."
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution este actualmente deconectat. DaЧi clic pe buton pentru a lucra "
 "conectat."
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nu pot seta stocarea localЦ -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Ooops! Vizualizarea pentru `%s' a murit nea╨teptat. :-(\n"
 "Aceasta НnseamnЦ cЦ probabil componenta %s a crЦpat."
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "ConЧinut invalid al mesajului"
+
+#: shell/e-shell.c:1646
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Eroare genericЦ"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "CreazЦ un grup nou de scurtЦturi."
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Nume grup:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9616,168 +11447,159 @@ msgstr ""
 "Chiar doriЧi sЦ НnlЦturaЧi grupul\n"
 "`%s' din bara de scurtЦturi?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Nu НnlЦtura"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
 msgstr "Redenume╨te grupul de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 msgid "Rename selected shortcut group to:"
 msgstr "Redenume╨te grupul de scurtЦturi selectat Нn:"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "Iconuri mici"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "AratЦ scurtЦturile ca iconuri mici"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "Iconuri mari"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "AratЦ scurtЦturile ca iconuri mari"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "Grup _Nou..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "CreazЦ un grup nou de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 msgid "_Remove this Group..."
 msgstr "нnlЦturЦ acest g_rup..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "нnlЦturЦ acest grup de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 msgid "Re_name this Group..."
 msgstr "Rede_nume╨te acest grup..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
 msgstr "Redenume╨te acest grup de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "Ascunde bara de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Ascunde bara de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
 msgstr "Redenume╨te scurtЦtura"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 msgid "Rename selected shortcut to:"
 msgstr "Redenume╨te scurtЦtura selectatЦ Нn:"
 
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Deschide"
-
-#: shell/e-shortcuts-view.c:474
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr "Deschide dosarul legat la aceastЦ scurtЦturЦ."
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Deschide Нn fereastrЦ nouЦ"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Deschide dosarul legat la aceastЦ scurtЦturЦ Нntr-o fereastrЦ nouЦ"
 
-#: shell/e-shortcuts-view.c:479
-msgid "Rename"
-msgstr "Redenume╨te"
-
-#: shell/e-shortcuts-view.c:479
+#: shell/e-shortcuts-view.c:383
 msgid "Rename this shortcut"
 msgstr "Redenume╨te aceastЦ scurtЦturЦ"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "нnlЦturЦ aceastЦ scurtЦturЦ din bara de scurtЦturi"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Eroare la salvarea scurtЦturilor."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr "ScurtЦturi"
 
-#: shell/e-shortcuts.c:984
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-shortcuts.c:987
-msgid "Contacts"
-msgstr "Contacte"
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(FЦrЦ nume)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "FЦrЦ eroare"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Eroare genericЦ"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "ExistЦ deja un dosar cu acela╨i nume"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Tipul de dosar specificat nu e valid"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Eroare I/O"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "SpaЧiu insuficient pentru a crea dosarul"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Dosarul specificat nu a fost gЦsit"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "FuncЧie neimplementatЦ Нn aceastЦ stocare"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "OperaЧie nesuportatЦ"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Tipul specificat nu e suportat Нn acestЦ stocare"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Dosarul specificat nu a fost gЦsit"
+
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Nu pot muta un dosar Нntr-unul din descendenЧii sЦi/"
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
@@ -9797,10 +11619,6 @@ msgstr "GazdЦ"
 msgid "The following connections are currently active:"
 msgstr "Urmatoarele conexiuni sunt actualmente active:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nume dosar:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Tip dosar:"
@@ -9815,17 +11633,29 @@ msgstr ""
 "DaЧi clic pe \"Import\" pentru a Нncepe importul fi╨ierului Нn Evolution. "
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Utilitate de import Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Utilitar de import Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "SelecteazЦ un fi╨ier"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant 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"
@@ -9845,10 +11675,11 @@ 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:"
+#, fuzzy
+msgid "Evolution can import data from the following files:"
 msgstr "Evolution a gЦsit urmЦtoarea sursЦ de date:"
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9877,7 +11708,7 @@ msgstr ""
 "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:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9885,25 +11716,30 @@ msgstr ""
 "VЦ mulЧumim\n"
 "Echipa Evolution\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 msgid "Cannot access the Evolution shell."
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Nu pot accesa shell-ul Evolution."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "InvalideazЦ ecranul de pornire"
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Trimite ie╨irile pentru depanare ale tuturor componentelor Нntr-un fi╨ier."
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nu pot iniЧializa sistemul de componente Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "CopiazЦ"
 
@@ -9919,11 +11755,11 @@ msgstr "CreazЦ contact nou"
 msgid "Create new contact list"
 msgstr "CreazЦ listЦ nouЦ de contacte"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "DecupeazЦ"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "DecupeazЦ selecЧia"
 
@@ -9931,73 +11767,118 @@ msgstr "DecupeazЦ selecЧia"
 msgid "Delete selected contacts"
 msgstr "╙terge contactele selectate"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Contact nou"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "New List"
 msgstr "ListЦ nouЦ"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lipe╨te"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Lipe╨te clipboard-ul"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "PrevizualizeazЦ contactele ce vor fi tipЦrite"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "TipЦre╨te contactele selectate"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "╙terge contactele selectate"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "SelecteazЦ tot"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "SelecteazЦ toate contactele"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Trimite _mesaj cЦtre contact..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "╙terge contactele selectate"
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Trimite mesaj la contact"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "Trimite contact la altcineva"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Opre╨te НncЦrcarea"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "_AcЧiuni"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "Surse _agendЦ..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ui/evolution-addressbook.xml.h:24
-msgid "_Contact Group"
-msgstr "Grup de _contact"
+#: ui/evolution-addressbook.xml.h:32
+#, fuzzy
+msgid "_Contact List"
+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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Contacte..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_TipЦre╨te..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "SalveazЦ ca ╨i card V"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_CautЦ contacte"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Unelte"
 
@@ -10007,111 +11888,130 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "CreazЦ un eveniment zilnic nou"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "CreazЦ o НntНlnire nouЦ"
+msgid "Create a New _Task"
+msgstr "CreazЦ o sarcinЦ nouЦ"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "CreazЦ o НntНlnire nouЦ"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "Zi"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "╙terge aceastЦ НntБlnire"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Mergi la"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Mergi Нnapoi Нn timp"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Mergi Нnainte Нn timp"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Mergi la _data"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Mergi la o anumitЦ data"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Mergi la timpul prezent"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Mergi la ziua de azi"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+msgid "Month"
+msgstr "Luna"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "нntБlnire nouЦ"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "SarcinЦ nouЦ"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "PrevizualizeazЦ calendar ce va fi tipЦrit"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "TipЦre╨te calendar"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Pre_vizualizeazЦ tipЦrire"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Print this calendar"
 msgstr "TipЦre╨te acest calendar"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "AratЦ 1 zi"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "AratЦ 1 lunЦ"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "AratЦ 1 sЦptЦmБnЦ"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "AratЦ sЦptЦmБna de lucru"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "_SЦptЦmБna de lucru"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "SЦptЦmБnЦ"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "_нntБlnire"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "SetЦri _mail..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "_Zi"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "_LunЦ"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Aceasta e informaЧie liber-ocupat."
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "_SЦptЦmБnЦ"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "SarcinЦ"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10122,15 +12022,16 @@ msgid "Close"
 msgstr "нnchide"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "нnchide aceastЦ НntБlnire"
+#, fuzzy
+msgid "Close this item"
+msgstr "╙terge acest articol"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "╙terge aceastЦ НntБlnire"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "╙terge acest articol"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Bara de unelte principalЦ"
 
@@ -10138,111 +12039,81 @@ msgstr "Bara de unelte principalЦ"
 msgid "Preview the printed item"
 msgstr "PrevizualizeazЦ articolul tipЦrit"
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
-msgid "Print Pre_view"
-msgstr "Pre_vizualizeazЦ tipЦrire"
-
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print S_etup"
-msgstr "S_eteazЦ tipЦrirea"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "TipЦre╨te"
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "SalveazЦ"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "SalveazЦ lista ╨i Нnchide cЦsuЧa de dialog"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "SalveazЦ acest articol pe disc"
 
-#: 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
-msgid "_Action"
-msgstr "_AcЧiune"
-
-#: 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Ajutor"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "TipЦre╨te plic..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "S_alvezЦ ca..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "SalveazЦ contact ╨i Нnchide cЦsuЧa de dialog"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Trimite co_ntact la altcineva..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Prime╨te ajutor conectat"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Trimite _mesaj cЦtre contact..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_SalveazЦ"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "╙terge aceastЦ listЦ"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "╙terge..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "SalveazЦ lista ╨i Нnchide cЦsuЧa de dialog"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Trimite lista la altcineva..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Trimite _mesaj cЦtre lista..."
 
@@ -10250,19 +12121,19 @@ msgstr "Trimite _mesaj cЦtre lista..."
 msgid "Cancel Mee_ting"
 msgstr "AnuleazЦ НntБlnirea"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "AnuleazЦ НntБlnirea pentru acest articol"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "нnainteazЦ ca ╨i _calendar i"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "нnainteazЦ acest articol prin email"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr "ObЧine ultimele informaЧii despre НntБlnire"
 
@@ -10274,15 +12145,10 @@ msgstr "ActualizeazЦ НntБlnirea"
 msgid "Schedule _Meeting"
 msgstr "Progra_mare НntБlniri"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Programare НntБlniri"
 
-#: 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-executive-summary.xml.h:1
 msgid "Customise My Evolution"
 msgstr "PersonalizeazЦ Evolution"
@@ -10296,67 +12162,64 @@ msgid "Cancel the current mail operation"
 msgstr "RenunЧЦ la operaЧia de mail curentЦ"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Compune"
-
-#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "Compune un mesaj nou"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr "CreazЦ sau editeazЦ conturile de mail ╨i alte preferinЧe"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "CreazЦ sau editeazЦ reguli pentru fltrarea mailurilor noi"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "CreazЦ sau editeazЦ definiЧiile dosarelor virtuale"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Gole╨_te gunoiul"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "UitЦ _parolele"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "UitЦ parolele memorate astfel veЧi fi Нntrebat despre ele din nou"
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "Administrare abonamente..."
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Mesaj"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "Deschide o fereastrЦ pentru a compune un mesaj nou"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "╙terg pentru totdeauna mesajele ╨terse din toate dosarele"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Trimite / Prime╨te"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Trimite mailurile din coadЦ ╨i descarcЦ mailurile noi"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr "AratЦ fereastra de previzualizare mesaje"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "VЦ abonaЧi sau dezabonaЧi la dosarele de pe serverul distant"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor dosar virtual..."
 
@@ -10380,91 +12243,102 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr "Trimite / Prime╨te"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "Abonare la dosarul \"%s\""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "SchimbЦ proprietЦЧile acestui dosar"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "CopiazЦ mesajele selectate"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "DecupeazЦ"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "DecupeazЦ mesajele selectate"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Ascunde mesajele selectate"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Ascunde mesajele ╨terse"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Ascunde mesajele citite"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Ascunde mesajele selectate mai degrabЦ decБt sЦ le afi╨ezi tЦiate cu o linie"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "MarcheazЦ tot ca citit"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "MarcheazЦ toate mesajele ca citite"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Lipe╨te mesajul la clipboard"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "╙terge pentru totdeauna toate mesajele din acest dosar"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "SelecteazЦ tot"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Selec_teazЦ НnlЦnЧuirea"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "SelecteazЦ tot ╨i numai mesajele care nu sunt actualmente selectate"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "SelecteazЦ toate mesajele aflate Нn aceea╨i НnlЦnЧuire cu mesajul selectat"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "╙terge toate mesajele vizibile"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "_AratЦ tot"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "Ascunde mesajele citite"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "AratЦ mesajele care au fost ascunse temporar"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Ascunde temporar toate mesajele care au fost deja citite"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Ascunde temporar mesajele selectate"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "ListЦ de mesaje НnlЦnЧuite"
 
@@ -10472,7 +12346,7 @@ msgstr "ListЦ de mesaje НnlЦnЧuite"
 msgid "_Expunge"
 msgstr "Distrug_e"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "Dosar"
 
@@ -10480,11 +12354,11 @@ msgstr "Dosar"
 msgid "_Invert Selection"
 msgstr "_InverseazЦ selecЧia"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_ProprietЦЧi..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
 msgstr "ListЦ de mesaje НnlЦnЧuite"
 
@@ -10704,7 +12578,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "Deschide mesajul selectat Нn compositor pentru a-l retrimite"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "PrevizualizeazЦ mesajul ce va fi tipЦrit"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10726,39 +12601,35 @@ msgstr "TipЦre╨te mesaj"
 msgid "Previous Unread Message"
 msgstr "Afi╨eazЦ mesajul necitit precedent"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "TipЦre╨te mesaj..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "PrevizualizeazЦ tipЦrirea..."
-
-#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Print this message"
 msgstr "TipЦre╨te mesaj"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "RЦspunde"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "RЦspunde la toЧi"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "CautЦ m_esajul"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "SalveazЦ mesajul ca un fi╨ier text"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr "CautЦ textul Нn corpul mesajului afi╨at"
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "SetЦri de paginЦ pentru imprimanta curentЦ"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "AratЦ sursa mesajului"
@@ -10799,67 +12670,51 @@ msgstr "Dosar V pentru destinata_ri..."
 msgid "VFolder on _Subject..."
 msgstr "Dosar V pentru _subiect..."
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_AplicЦ filtrele"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr "CopiazЦ Нn folder"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "_CreazЦ filtru din mesaj"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr "нnainteazЦ mesaj"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr "Afi╨eazЦ mesaj"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "_MutЦ in dosar"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr "Afi╨are normalЦ"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "Deschide mesajul"
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Re-send Message"
-msgstr "_Retrimite mesaj"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "нnchide aceastЦ fereastrЦ"
 
-#: 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 "PersonalizeazЦ"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
-msgid "Customize toolbars"
-msgstr "PersonalizeazЦ bЦrile de unelte"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "нn_chide"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vizualizare"
 
@@ -10924,11 +12779,6 @@ msgstr "Criptare S/MIME"
 msgid "S/MIME Sign"
 msgstr "SemneazЦ S/MIME"
 
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
-msgid "Save"
-msgstr "SalveazЦ"
-
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "SalveazЦ ca"
@@ -11057,7 +12907,7 @@ msgstr "CБmpul _RЦspuns la"
 msgid "_Security"
 msgstr "_Securitate"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "Ajutor"
 
@@ -11090,14 +12940,29 @@ msgid "Unsubscribe"
 msgstr "DezaboneazЦ"
 
 #: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Assign Task"
+msgstr "Atribuie task (FIXME)"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "AnuleazЦ sarcina"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
-msgstr "Delegare sarcinЦ"
+#: ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Cancel this task"
+msgstr "AnuleazЦ sarcina"
 
 #: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Obtain the latest task information"
+msgstr "ObЧine ultimele informaЧii despre НntБlnire"
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "ReНmprospЦteazЦ sarcina"
 
@@ -11105,40 +12970,28 @@ msgstr "ReНmprospЦteazЦ sarcina"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "CopiazЦ sarcinile selectate"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "CreazЦ o sarcinЦ nouЦ"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "DecupeazЦ sarcina selectatЦ"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "╙terge sarcinile selectate"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr "SarcinЦ nouЦ"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Lipe╨te sarcina din clipboard"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr "SalveazЦ sarcina ca altceva"
-
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "SetЦri"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "SarcinЦ"
 
@@ -11170,173 +13023,155 @@ msgstr "CreazЦ o legЦturЦ la acest dosar Нn bara de scurtЦturi"
 msgid "Create a new folder"
 msgstr "Creez un dosar nou"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
 msgstr "╙terge acest dosar"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Afi╨eazЦ un dosar diferit"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "Ie╨ire"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "Fereastra Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Ie╨ire din program"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "Ghid de iniЧiere"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "ImportЦ un format de fi╨ier extern"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "MutЦ acest dosar Нn altЦ parte"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "Deschide Нn fereastrЦ noua"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Deschide acest dosar Нn altЦ fereastrЦ"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "AratЦ informaЧii despre Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "RaporteazЦ o eroare"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "RaporteazЦ o eroare"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "RaporteazЦ o eroare folosind Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "ComutЦ"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "ComutЦ Нn timp ce se aratЦ bara folder"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "ComutЦ Нn timp ce se aratЦ bara cu scurtЦturi"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "SelecteazЦ Нn timp lucrЦm deconectaЧi"
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr "Ghid de utilizare a managerului de contacte"
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr "Ghid de utilizare a calendarului"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "Ghid de utilizare a programului de mail"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "VizualizeazЦ dosarul selectat"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "Despre Evolution..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_нntБlnire (FIXME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_CopiazЦ..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "Bara dosar"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "_ImportЦ fi╨ier..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "_Index"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "Mesaj _mail"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_MutЦ..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "Dosar _nou"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Redenume╨te..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_ScurtЦturЦ"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Bara cu _scurtЦturi"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "_SarcinЦ (FIXME)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "LucreazЦ deconectat"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+#, fuzzy
+msgid "Change the settings for the summary"
 msgstr "SchimbЦ setЦrile pentru Evolution"
 
 #: ui/my-evolution.xml.h:4
-msgid "_My Evolution Settings..."
-msgstr "SetЦri Evolution..."
+#, fuzzy
+msgid "Print summary"
+msgstr "Sumar mail"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Cite╨te"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "SetЦri pentru Executive Summary..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -11370,6 +13205,28 @@ msgstr "Mesaje"
 msgid "With Category"
 msgstr "Cu categorie"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Selectez ora localЦ"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "SelecЧie"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Ore locale"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"FolosiЧi butonul din stБnga al mausului pentru a mЦri o zonЦ de pe hartЦ ╨i "
+"selectaЧi ora localЦ.\n"
+" FolosiЧi butonul din dreapta al mausului pentru a mic╨ora."
+
 #. 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
@@ -11377,10 +13234,6 @@ msgstr "Cu categorie"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Ocupat"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "AfarЦ din oficiu"
@@ -11453,7 +13306,7 @@ msgstr "ToЧi participanЧii"
 msgid "_Current View"
 msgstr "Vizualizarea _curentЦ"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "Define╨te vizualizЦri"
 
@@ -11463,19 +13316,20 @@ msgstr "Define╨te vizualizЦri"
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Acum"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "AstЦzi"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ora trebuie sЦ fie Нn formatul: %s"
@@ -11557,35 +13411,33 @@ msgstr "Codare caractere"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "CautЦ Нnainte"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "SalveazЦ cЦutarea"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "CЦutare avansatЦ"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "SalveazЦ cЦutarea"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "╙terge"
 
 #: 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:152
 msgid "Information"
 msgstr "InformaЧie"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Avertisment"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Eroare"
@@ -11603,10 +13455,15 @@ msgstr "Mesaj"
 msgid "Don't show this message again."
 msgstr "Nu arЦta acest mesaj din nou"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_CЦutare"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "LegЦtura DN:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Serverul personal agendЦ de adrese"
@@ -11627,6 +13484,321 @@ msgstr "init_corba(): nu pot iniЧializa GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 
+#~ msgid "RDF Summary"
+#~ msgstr "Rezumat RDF"
+
+#~ msgid "LDAP Server"
+#~ msgstr "Server LDAP"
+
+#~ msgid "File"
+#~ msgstr "Fi╨ier"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Tip de agendЦ necunoscut"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "FЦrЦ (mod anonim)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Tip de autorizare necunoscut"
+
+#~ msgid "Subtree"
+#~ msgstr "Subarbore"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "FIXME Text ajutor pentru legЦtura DN"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "FIXME Text ajutor gazdЦ"
+
+#~ msgid "Root DN:"
+#~ msgstr "RЦdЦcina DN"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "FIXME Text ajutor rЦdЦcina DN"
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "FIXME Text ajutor port"
+
+#~ msgid "Authentication:"
+#~ msgstr "Autentificare:"
+
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "OpЧiuni avansate LDAP "
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "FIXME Text ajutor cale"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Creez calea dacЦ nu existЦ."
+
+#~ 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"
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "FIXME Text ajutor nume"
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "FIXME Text ajutor descriere"
+
+#~ msgid "Name"
+#~ msgstr "Nume"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "IntroduceЧi parola pentru %s"
+
+#~ msgid "Category contains"
+#~ msgstr "Categoria conЧine"
+
+#~ msgid "Select name from _folder:"
+#~ msgstr "SelecЧie nume din dosar:"
+
+#~ msgid "USA"
+#~ msgstr "SUA"
+
+#~ msgid "Canceled"
+#~ msgstr "Anulat"
+
+#~ msgid "Transparent"
+#~ msgstr "Transparent"
+
+#~ msgid "Opaque"
+#~ msgstr "Opac"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "Clasificarea trebuie sЦ fie 'Public', 'Privat', 'ConfidenЧial' sau "
+#~ "'Neclasificat'"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr ""
+#~ "Nivelul de transparenЧЦ poate fi 'Transparent', 'Opac', sau 'Inexistent'."
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Beep cНnd apare fereastra alarmei."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "PreferinЧe calendar"
+
+#~ msgid "Colors for Tasks"
+#~ msgstr "Culoare pentru sarcini"
+
+#~ msgid "Date Navigator"
+#~ msgstr "Data navigator"
+
+#~ msgid "Defaults"
+#~ msgstr "Implicit"
+
+#~ msgid "Notification Options"
+#~ msgstr "OpЧiuni noficare"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Aminte╨te-mi toate НntБlnirile"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minute Нnainte de a avea loc."
+
+#~ msgid "Delegated From:"
+#~ msgstr "Delegat de la:"
+
+#~ msgid "No one"
+#~ msgstr "Nimeni"
+
+#~ msgid "Task"
+#~ msgstr "SarcinЦ"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Terminat:"
+
+#~ msgid "Transparency"
+#~ msgstr "TransparenЧЦ"
+
+#~ msgid "This is an event that can be added to your calendar."
+#~ msgstr "Acesta e un eveniment ce poate fi adЦugat Нn calendar."
+
+#~ msgid "This is a meeting request."
+#~ msgstr "Aceasta e o cerere de НntБlnire."
+
+#~ msgid "This is one or more additions to a current meeting."
+#~ msgstr "Aceasta e o adЦugare (sau mai multe) la o НntБlnire curentЦ."
+
+#~ msgid "This is a request for the latest event information."
+#~ msgstr "Aceasta e o cerere pentru ultima informaЧie despre eveniment."
+
+#~ msgid "This is an event cancellation."
+#~ msgstr "Aceasta e o revocare a unui eveniment."
+
+#~ msgid "The message is not understandable."
+#~ msgstr "Mesajul este neinteligibil."
+
+#~ msgid "This is an task that can be added to your calendar."
+#~ msgstr "Aceasta e o sarcinЦ ce poate fi adЦugatЦ la calendar."
+
+#~ msgid "This is a task request."
+#~ msgstr "Aceasta e o cerere de sarcinЦ."
+
+#~ msgid "This is a reply to a task request."
+#~ msgstr "Acesta e un rЦspuns la o cerere de sarcinЦ."
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Mesajul nu pare a fi formatat corespunzЦtor."
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Mesajul conЧine numai cererile nesuportate."
+
+#~ msgid "The information contained in this attachment was not valid"
+#~ msgstr "InformaЧia conЧinutЦ Нn acest ata╨ a fost invalidЦ"
+
+#~ msgid "All"
+#~ msgstr "Tot"
+
+#~ msgid "Edit"
+#~ msgstr "Editez"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Stochez cЦutarea ca dosar V"
+
+#~ msgid "Resend"
+#~ msgstr "Retrimite"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Manager de conturi Evolution"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "нn %s, %s a scris:"
+
+#~ msgid "Receiving"
+#~ msgstr "Primesc"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Afi╨eazЦ dosarele НncepБnd cu:"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "SetЦri Evolution..."
+
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %d %B %Y"
+
+#~ msgid "Print My Evolution"
+#~ msgstr "TipЦre╨te Evolution"
+
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "TipЦrirea Evolution nereu╨itЦ"
+
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Contact nou"
+
+#~ msgid "_Contact Group"
+#~ msgstr "Grup de _contact"
+
+#~ msgid "Go to present time"
+#~ msgstr "Mergi la timpul prezent"
+
+#~ msgid "W_ork Week"
+#~ msgstr "_SЦptЦmБna de lucru"
+
+#~ msgid "_Day"
+#~ msgstr "_Zi"
+
+#~ msgid "_Month"
+#~ msgstr "_LunЦ"
+
+#~ msgid "_Week"
+#~ msgstr "_SЦptЦmБnЦ"
+
+#~ msgid "Close this appointment"
+#~ msgstr "нnchide aceastЦ НntБlnire"
+
+#~ msgid "Print S_etup"
+#~ msgstr "S_eteazЦ tipЦrirea"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "SalveazЦ НntБlnirea ╨i Нnchide cЦsuЧa de dialog"
+
+#~ msgid "_Action"
+#~ msgstr "_AcЧiune"
+
+#~ msgid "Help"
+#~ msgstr "Ajutor"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Trimite co_ntact la altcineva..."
+
+#~ msgid "See online help"
+#~ msgstr "Prime╨te ajutor conectat"
+
+#~ msgid "Compose"
+#~ msgstr "Compune"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Administrare abonamente..."
+
+#~ msgid "Show _All"
+#~ msgstr "_AratЦ tot"
+
+#~ msgid "Print Preview..."
+#~ msgstr "PrevizualizeazЦ tipЦrirea..."
+
+#~ msgid "_Re-send Message"
+#~ msgstr "_Retrimite mesaj"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Personali_zeazЦ bara de unelte..."
+
+#~ msgid "Customize"
+#~ msgstr "PersonalizeazЦ"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "PersonalizeazЦ bЦrile de unelte"
+
+#~ msgid "Delegate Task"
+#~ msgstr "Delegare sarcinЦ"
+
+#~ msgid "Save task as something else"
+#~ msgstr "SalveazЦ sarcina ca altceva"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Ghid de iniЧiere"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Ghid de utilizare a managerului de contacte"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Ghid de utilizare a calendarului"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Ghid de utilizare a programului de mail"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_нntБlnire (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#~ msgid "_Index"
+#~ msgstr "_Index"
+
+#~ msgid "_Mail message"
+#~ msgstr "Mesaj _mail"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_SarcinЦ (FIXME)"
+
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "SetЦri Evolution..."
+
 #~ msgid "File not found"
 #~ msgstr "Nu gЦsesc fi╨ierul"
 
@@ -11639,21 +13811,9 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ msgid "Edit this task"
 #~ msgstr "EditeazЦ aceastЦ sarcinЦ"
 
-#~ msgid "Go to Today"
-#~ msgstr "Mergi la ziua de azi"
-
 #~ msgid "Delete all Occurrences"
 #~ msgstr "╙terge toate apariЧiile"
 
-#~ msgid "Summary contains"
-#~ msgstr "Rezumatul conЧine"
-
-#~ msgid "Description contains"
-#~ msgstr "Descrierea conЧine"
-
-#~ msgid "Comment contains"
-#~ msgstr "Comentariul conЧine"
-
 #~ msgid "Has category"
 #~ msgstr "Are categoria"
 
@@ -11675,9 +13835,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "Redenumesc vechiul dosar ╨i deschid"
 
-#~ msgid "Creating new folder"
-#~ msgstr "Creez dosar nou"
-
 #~ msgid "Copying messages"
 #~ msgstr "Copiez mesaje"
 
@@ -11693,9 +13850,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (mesaj Нnaintat)"
 
-#~ msgid "Fwd: (no subject)"
-#~ msgstr "нnaintat: (fЦrЦ subiect)"
-
 #~ msgid "Forwarded message (no subject)"
 #~ msgstr "Mesaj Нnaintat (fЦrЦ subiect)"
 
@@ -11724,12 +13878,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "CreazЦ un calendar nou"
 
-#~ msgid "Day"
-#~ msgstr "Zi"
-
-#~ msgid "Month"
-#~ msgstr "Luna"
-
 #~ msgid "New _Event"
 #~ msgstr "_Eveniment nou"
 
@@ -11745,9 +13893,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ msgid "Settings..."
 #~ msgstr "SetЦri..."
 
-#~ msgid "Week"
-#~ msgstr "SЦptЦmБnЦ"
-
 #~ msgid "_Open Calendar"
 #~ msgstr "_Deschide calendar"
 
@@ -11821,9 +13966,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ msgid "Alarms timeout after"
 #~ msgstr "Oprire alarmЦ dupa"
 
-#~ msgid "Colors"
-#~ msgstr "Culori"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "Validez moЧЦire pentru"
 
@@ -11842,9 +13984,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ msgid "Overdue Items:"
 #~ msgstr "Termen depЦ╨it"
 
-#~ msgid "TaskPad"
-#~ msgstr "Panou sarcini"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Timp rЦmas"
 
@@ -12029,9 +14168,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ 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."
 
@@ -12114,9 +14250,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "Agenda... (FIXME)"
 
-#~ msgid "C_lear"
-#~ msgstr "╙terge"
-
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "VerificЦ nume (FIXME)"
 
@@ -12159,9 +14292,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ msgid "Select everything"
 #~ msgstr "SelecteazЦ tot"
 
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "Ce_rere task (FIXME)"
-
 #~ msgid "_About..."
 #~ msgstr "_Despre..."
 
@@ -12195,15 +14325,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ 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 "S_ource"
 #~ msgstr "Sursa"
 
@@ -12236,12 +14357,6 @@ msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 #~ 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"
 
diff --git a/po/ru.po b/po/ru.po
index a41a9e25d5..ecc542e5b4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,10 +1,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Valek Filippov <frob@df.ru>, 2000.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2001-08-10 16:12+0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2001-08-10 17:53+0400\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -20,11 +21,11 @@ msgstr "Фабрика для импорта файлов VCard в Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Импортирует файлы VCard в Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3624
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Карточка: "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -32,7 +33,7 @@ msgstr ""
 "\n"
 "Имя: "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -40,7 +41,7 @@ msgstr ""
 "\n"
 "  Префикс:    "
 
-#: addressbook/backend/ebook/e-card.c:3628
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -48,7 +49,7 @@ msgstr ""
 "\n"
 "  Имя: "
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -56,7 +57,7 @@ msgstr ""
 "\n"
 "  Добавочный: "
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -64,7 +65,7 @@ msgstr ""
 "\n"
 "  Фамилия:    "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -72,7 +73,7 @@ msgstr ""
 "\n"
 "  Суффикс:     "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -80,7 +81,7 @@ msgstr ""
 "\n"
 "Дата рождения: "
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -88,7 +89,7 @@ msgstr ""
 "\n"
 "Адрес:"
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -96,7 +97,7 @@ msgstr ""
 "\n"
 "Почтовый ящик:  "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -104,7 +105,7 @@ msgstr ""
 "\n"
 "  Расш.:        "
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -112,7 +113,7 @@ msgstr ""
 "\n"
 "  Улица:     "
 
-#: addressbook/backend/ebook/e-card.c:3661
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -120,7 +121,7 @@ msgstr ""
 "\n"
 "  Город:      "
 
-#: addressbook/backend/ebook/e-card.c:3662
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -128,7 +129,7 @@ msgstr ""
 "\n"
 "  Область:      "
 
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -136,7 +137,7 @@ msgstr ""
 "\n"
 "  Почтовый код: "
 
-#: addressbook/backend/ebook/e-card.c:3664
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -144,7 +145,7 @@ msgstr ""
 "\n"
 "  Страна:     "
 
-#: addressbook/backend/ebook/e-card.c:3677
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -152,7 +153,7 @@ msgstr ""
 "\n"
 "Метка для доставки:"
 
-#: addressbook/backend/ebook/e-card.c:3689
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -160,7 +161,7 @@ msgstr ""
 "\n"
 "Телефоны:\n"
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -168,7 +169,7 @@ msgstr ""
 "\n"
 "Телефон:"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -176,7 +177,7 @@ msgstr ""
 "\n"
 "Эл.адрес:\n"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -184,7 +185,7 @@ msgstr ""
 "\n"
 "Эл.адрес:"
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -192,7 +193,7 @@ msgstr ""
 "\n"
 "Почтовый клиент: "
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -200,7 +201,7 @@ msgstr ""
 "\n"
 "Часовой пояс: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -208,7 +209,7 @@ msgstr ""
 "\n"
 "Геогр.положение: "
 
-#: addressbook/backend/ebook/e-card.c:3756
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -216,7 +217,7 @@ msgstr ""
 "\n"
 "Должность: "
 
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -224,7 +225,7 @@ msgstr ""
 "\n"
 "Орг.:"
 
-#: addressbook/backend/ebook/e-card.c:3769
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -232,7 +233,7 @@ msgstr ""
 "\n"
 "  Имя:  "
 
-#: addressbook/backend/ebook/e-card.c:3770
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -240,7 +241,7 @@ msgstr ""
 "\n"
 "Единица:  "
 
-#: addressbook/backend/ebook/e-card.c:3771
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -248,7 +249,7 @@ msgstr ""
 "\n"
 "Единица2: "
 
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -256,7 +257,7 @@ msgstr ""
 "\n"
 "Единица3: "
 
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -264,7 +265,7 @@ msgstr ""
 "\n"
 "Единица4: "
 
-#: addressbook/backend/ebook/e-card.c:3777
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -272,7 +273,7 @@ msgstr ""
 "\n"
 "Категории: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -290,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3791
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -298,7 +299,7 @@ msgstr ""
 "\n"
 "Уникальная строка: "
 
-#: addressbook/backend/ebook/e-card.c:3794
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -306,11 +307,11 @@ msgstr ""
 "\n"
 "Публичный ключ: "
 
-#: addressbook/backend/ebook/e-card.c:4066
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Множество VCards"
 
-#: addressbook/backend/ebook/e-card.c:4074
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
@@ -319,7 +320,7 @@ msgstr "VCard для %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/conduit/address-conduit.c:1100
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
@@ -335,20 +336,20 @@ msgstr "Курсор не может быть загружен\n"
 msgid "EBook not loaded\n"
 msgstr "EBook не загружена\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Невозможно прочесть блок приложения адресов Пилота"
 
@@ -398,6 +399,41 @@ msgstr "Фабрика компонента адресной книги Evolution."
 msgid "Factory for the sample Addressbook control"
 msgstr "Щелкните здесь для адресной книги"
 
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
+msgstr "Контакты"
+
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Ошибка при загрузке информации фильтра:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Новый контакт:"
+
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Новый контакт:"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Список контакты"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Список контакты"
+
 #: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
 msgstr "Правка адресной книги"
@@ -415,149 +451,143 @@ msgid "Add Addressbook"
 msgstr "Добавить адресную книгу"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Источники адресных книг..."
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Advanced"
 msgstr "Расширенные"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
 msgstr "Основа"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:7
 #: calendar/gui/dialogs/task-editor.c:151
 msgid "Basic"
 msgstr "Основные"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:8
 msgid "De_lete"
 msgstr "Удалить"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.glade.h:9
 msgid "One"
 msgstr "Один"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:10
 #, fuzzy
 msgid "Search _base:"
 msgstr "Поиск области действия:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:11
 #, fuzzy
 msgid "Search s_cope: "
 msgstr "Поиск области действия:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Server Name"
 msgstr "Название сервера"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/addressbook-config.glade.h:13
 #, fuzzy
 msgid "Sub"
 msgstr "Вс"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "The information below is required in order to add an addressbook.  "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "This information is not required for most ldap servers. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:17
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/addressbook-config.glade.h:18
 msgid "This is the name of the server where your addressbook is located."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/addressbook-config.glade.h:19
 msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.glade.h:20
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "_Account name:"
 msgstr "Название счёта:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:88
-#: my-evolution/my-evolution.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "Добавить"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-#: mail/mail-config.glade.h:93 ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "Правка"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
+#: addressbook/gui/component/addressbook-config.glade.h:24
 msgid "_My server requires authentication"
 msgstr "Сервер требует идентификации"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:25
 msgid "_Port:"
 msgstr "Порт:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/addressbook-config.glade.h:26
 msgid "_Server name:"
 msgstr "Название сервера:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "label18"
-msgstr "метка26"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "label19"
-msgstr "метка26"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "label20"
-msgstr "метка26"
-
-#: addressbook/gui/component/addressbook-storage.c:135
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "Другие контакты"
 
-#: addressbook/gui/component/addressbook.c:371
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Пожалуйста введите ваш эл.адрес и парольную фразу для доступа к %s"
 
-#: addressbook/gui/component/addressbook.c:379
+#: addressbook/gui/component/addressbook.c:394
 msgid "LDAP Authentication"
 msgstr "Идентификация LDAP"
 
-#: addressbook/gui/component/addressbook.c:390
+#: addressbook/gui/component/addressbook.c:405
 msgid "Email Address:"
 msgstr "Эл.адрес:"
 
-#: addressbook/gui/component/addressbook.c:403
+#: addressbook/gui/component/addressbook.c:418
 msgid "Password:"
 msgstr "Пароль:"
 
-#: addressbook/gui/component/addressbook.c:466
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Не удалось открыть адресную книгу"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -567,7 +597,7 @@ msgstr ""
 "что либо вы ввели неправильный URI, либо LDAP\n"
 "сервер не отвечает"
 
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -579,7 +609,7 @@ msgstr ""
 "перекомпилировать программу из исходных текстов в CVS после\n"
 "установки OpenLDAP полученного по приведённой ниже ссылке.\n"
 
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -587,29 +617,39 @@ msgstr ""
 "Не удалось открыть эту адресную книгу. Проверьте, что путь существует\n"
 "и что у вас есть необходимые права доступа."
 
-#: addressbook/gui/component/addressbook.c:637
-#: calendar/gui/cal-search-bar.c:54
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
-#: addressbook/gui/component/addressbook.c:638
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Имя содержит"
 
-#: addressbook/gui/component/addressbook.c:639
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "Эл.адрес содержит"
 
-#: addressbook/gui/component/addressbook.c:640
-msgid "Category contains"
-msgstr "Категория содержит"
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
+#, fuzzy
+msgid "Category is"
+msgstr "Категории:"
 
-#: addressbook/gui/component/addressbook.c:641 widgets/misc/e-filter-bar.h:97
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Расширенные..."
 
-#: addressbook/gui/component/addressbook.c:800
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Категории:"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, который будет показывать программа просмотра папок"
 
@@ -624,19 +664,19 @@ 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:1581
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "Первый эл.адрес"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1582
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "Эл.адрес 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1583
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "Эл.адрес 3"
 
@@ -658,19 +698,19 @@ msgstr "Добавить адрес к существующему контакту \"%s\""
 msgid "Querying Addressbook..."
 msgstr "Запрос к адресной книге..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Правка контактной информации"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Добавить к контактам"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "Объединить эл.адреса"
 
@@ -691,10 +731,10 @@ 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:639
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Удалить"
 
@@ -710,21 +750,26 @@ msgstr "Отправка эл.почты в HTML?"
 msgid "Unnamed Contact"
 msgstr "Неназванный контакт"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "C_ontaining:"
 msgstr "Содержит:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "Поиск"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "Контакты"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Message Recipients"
-msgstr "Получатели сообщения"
+msgid "F_ind"
+msgstr "Поиск"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Select Names"
@@ -742,6 +787,11 @@ msgstr "Категория:"
 msgid "_Folder:"
 msgstr "Папка:"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Получатели сообщения"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Годовщина:"
@@ -770,11 +820,11 @@ msgid "Details"
 msgstr "Детали"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Файл как:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "General"
 msgstr "Общее"
 
@@ -798,180 +848,187 @@ msgstr "Тип телефона"
 msgid "Wants to receive _HTML mail"
 msgstr "Хочет получать почту в HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Адрес web-страницы:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "Адрес..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "Имя помощника:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "День рождения:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "Рабочий"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "Контакты..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1472 mail/folder-browser.c:1313
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:88
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "Удалить"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "Отдел"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "Полное имя..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "Домашний"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "Должность:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Имя менеджера:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "Мобильный"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "Псевдоним:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "Офис:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "Профессия:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "Супруг(а):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "Это почтовый адрес"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Адрес web-страницы:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Удалить контакт?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Этот контакт принадлежит следующим категориям:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1539
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Помощник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1540
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Рабочий"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1541
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Рабочий 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1542
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1543
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Обратный отзвон"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1544
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Машина"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1545
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Компания"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1546
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Домашний"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1547
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Домашний 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1548
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1549
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1550
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Другой"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1552
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1553
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Пэйджер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1554
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Первый"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1555
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1556
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Не удалось удалить итоговый файл папки \"%s\": %s"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Быстрое добавление контакта"
@@ -981,7 +1038,7 @@ msgid "Edit Full"
 msgstr "Правка полного имени"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Полное имя:"
 
@@ -1001,42 +1058,1033 @@ msgid "Address _2:"
 msgstr "Адрес 2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Помощник"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Автоматическое"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Ориентация"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "Август"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "годы"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+msgid "Belize"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+msgid "Benin"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Эл.адрес"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Канада"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Председатель"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Проверить адрес"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Китайский"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Китайский"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Создать"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Копирование"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "Страна:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Финляндия"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "США"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Отмена"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "Греческий"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Финляндия"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Канада"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "д.п."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Общее"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Эл.адрес"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "часы"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Воскресенье"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+#, fuzzy
+msgid "India"
+msgstr "Индивидуальное"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#, fuzzy
+msgid "Ireland"
+msgstr "Корейский"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+#, fuzzy
+msgid "Japan"
+msgstr "Японский"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#, fuzzy
+msgid "Jordan"
+msgstr "Корейский"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Самый низкий"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Самый низкий"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "Апрель"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Март"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Почта"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Почта"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Почта"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Поля"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Май"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Понедельник"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Мобильный"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Управляющий"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Ответить"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Следующая подшивка"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Новый контакт:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Высокий"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "Апрель"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "минута"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Сейчас"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Вставить"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Канада"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Бумага"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Финляндия"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Портрет"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "после"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Разделы:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Канада"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Дым"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Общее"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr ""
+"Вставить встречу\n"
+"в расписание"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Нормальный"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Отправить"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Вск"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Псевдоним"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Финляндия"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Прочитанное"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Дождь"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Список заданий"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Финляндия"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Кому"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Торнадо"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Втр"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Турецкий"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Канада"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#, fuzzy
+msgid "Ukraine"
+msgstr "Украинский"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Неозаглавленное сообщение"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Выбрать имена"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#, fuzzy
+msgid "Western Sahara"
+msgstr "Западноевропейский"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Прочитанное"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "Адрес:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "Город:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "Аб.ящик:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "Область/Район (Штат/Провинция):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "Почтовый индекс:"
 
@@ -1125,7 +2173,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "Скрывать адреса при отправке почты в этот список"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "Удалить"
 
@@ -1143,7 +2191,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr "Обнаружено дублирование контактов"
 
@@ -1162,30 +2210,31 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+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:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "Конфликтующий контакт:"
 
-#: 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:5
 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:146
-#: widgets/misc/e-filter-bar.c:241
+#: widgets/misc/e-filter-bar.c:243
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:258
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Поиск"
 
@@ -1299,10 +2348,10 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:1286
-#: ui/evolution-addressbook.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Сохранить как VCard"
 
@@ -1312,37 +2361,37 @@ msgid "Open"
 msgstr "Открыть"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send contact to other"
-msgstr "Послать контакт другому"
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Переслать вложенное"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:674
-#: ui/evolution-addressbook.xml.h:26
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "Послать сообщение к контакту"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:675
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Печать"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "Печать конверта"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1357,8 +2406,8 @@ msgid "Success"
 msgstr "Успешно"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1619
-#: shell/e-storage.c:501
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -1367,7 +2416,7 @@ msgstr "Неизвестная ошибка"
 msgid "Repository offline"
 msgstr "Работать вне сети"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Отказ в доступе"
 
@@ -1384,7 +2433,11 @@ msgid "Protocol not supported"
 msgstr "Протокол не поддерживается"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "Отменено"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1408,131 +2461,131 @@ msgid "Error removing list"
 msgstr "Ошибка при удалении списка"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1159
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr "Ошибка при удалении карточки"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Щелкните здесь для добавления контакта *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Файл как"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "Эл.адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Первый телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Телефон помощника"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Рабочий телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "Обратный отзвон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Телефон компании"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Организация"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Рабочий адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Телефон в машине"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Рабочий телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Другие телефоны"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Другие адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Сайт в Интернет"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Отдел"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Офис"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Заголовок"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Профессия"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Управляющий"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:811
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Супруг(а)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:812
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Заметка"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1156
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "Сделано"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1188
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr "Удаление карточек..."
 
@@ -1726,10 +2779,22 @@ msgstr "Ширина:"
 msgid "_Font..."
 msgstr "Шрифт..."
 
-#: addressbook/printing/e-contact-print.glade.h:43
-#: my-evolution/my-evolution.glade.h:31
-msgid "label26"
-msgstr "метка26"
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Напечатать календарь"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Напечатать календарь"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Печать конверта"
 
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
@@ -1893,42 +2958,42 @@ msgstr "Не удалось инициализировать gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Не удалось создать временный каталог: %s"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:414
 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/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
 #: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:435
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:442
 #: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
 #: my-evolution/e-summary-calendar.c:240
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:579
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1967,20 +3032,20 @@ msgstr "З"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:641
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Высокий"
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:640
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "Нормальный"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:639
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Низкий"
 
@@ -2014,20 +3079,13 @@ msgstr "В процессе"
 msgid "Completed"
 msgstr "Выполнено"
 
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
-msgid "Cancelled"
-msgstr "Отменено"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:842 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -2070,14 +3128,13 @@ msgid "Undefined"
 msgstr "Неопределенное"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1398
-#: mail/mail-accounts.c:134 mail/mail-accounts.c:388
-#: mail/mail-config.glade.h:47 shell/e-shell-view.c:1380
-#: 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
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
 msgid "None"
 msgstr "Нет"
 
@@ -2091,13 +3148,13 @@ msgstr "Связанное"
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
 #: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1279
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Да"
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1280
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Нет"
 
@@ -2117,53 +3174,83 @@ msgstr "Просмотр недели"
 msgid "Month View"
 msgstr "Просмотр месяца"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
 msgstr "Итог содержит"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:57
 msgid "Description contains"
 msgstr "Описание содержит"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "Коментарий содержит"
 
-#: calendar/gui/cal-search-bar.c:378
-msgid "Category:"
-msgstr "Категории:"
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Календарь"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Задания"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Вирт.папка по списку рассылки"
 
-#. All, Unmatched, separator items
-#: calendar/gui/cal-search-bar.c:498
-msgid "All"
-msgstr "Все"
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Создать новую встречу"
 
-#: calendar/gui/cal-search-bar.c:503
-msgid "Unfiled"
-msgstr "Незаполненное"
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr "Новая встреча"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Создать новое задание"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Новое задание"
 
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URI, который будет показывать календарь"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr "Параметры аудио таймеров"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr "Параметры сообщений таймера"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Отобразить параметры"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2213,95 +3300,95 @@ msgstr "часы"
 msgid "minutes"
 msgstr "минуты"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr "%d дней"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 день"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d недель"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 неделя"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d часов"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 час"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d минут"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 минута"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 секунда"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Запустить программу"
 
-#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
 #: calendar/gui/dialogs/meeting-page.c:601
 #: calendar/gui/dialogs/meeting-page.c:636
 #: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1251
-#: calendar/gui/dialogs/meeting-page.c:1267
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Неизвестное"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:409
 msgid "before start of appointment"
 msgstr "до начала встречи"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 msgid "after start of appointment"
 msgstr "после начала встречи"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 msgid "before end of appointment"
 msgstr "перед окончанием встречи"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 msgid "after end of appointment"
 msgstr "после окончания встречи"
 
@@ -2312,7 +3399,6 @@ msgstr "Основы"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Дата/Время:"
 
@@ -2322,7 +3408,7 @@ msgstr "Напоминания"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Итог:"
 
@@ -2330,12 +3416,11 @@ msgstr "Итог:"
 msgid "_Options..."
 msgstr "Параметры..."
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "после"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "до"
 
@@ -2352,15 +3437,11 @@ msgstr "завершение встречи"
 msgid "hour(s)"
 msgstr "часы"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
-msgid "label55"
-msgstr "метка26"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:18 mail/mail-config.glade.h:113
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "минуты"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:19
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "начало встречи"
 
@@ -2373,164 +3454,226 @@ msgid "10 minutes"
 msgstr "10 минут"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12-часовой (ДП/ПП)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 минут"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24-часовой"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 минут"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 минут"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Calendar Preferences"
-msgstr "Настройки календаря"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "Установки календаря..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Compress weekends in month view"
-msgstr "Сжать выходные дни в просмотре месяца"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:26
-msgid "Display"
-msgstr "Отобразить"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Создать новую встречу"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "End of day:"
-msgstr "Конец дня:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "Days"
+msgstr "дни"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "First day of week:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#, fuzzy
+msgid "First day of wee_k:"
 msgstr "Первый день недели:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Fri"
-msgstr "Пят"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Пятница"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Mon"
-msgstr "Пон"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#, fuzzy
+msgid "Hours"
+msgstr "часы"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, fuzzy
+msgid "Minutes"
+msgstr "минуты"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Понедельник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #, fuzzy
-msgid "Overdue tasks:"
+msgid "O_verdue tasks:"
 msgstr "Просроченные задания"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Sat"
-msgstr "Суб"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Суббота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
-msgid "Show appointment end times in week and month views"
+msgid "Show appointment _end times in week and month views"
 msgstr "Показать время окончании встречи"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #, fuzzy
-msgid "Show week numbers in date navigator"
+msgid "Show week _numbers in date navigator"
 msgstr "Показать номера недель"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Start of day:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "Sta_rt of day:"
 msgstr "Начало дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Sun"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#, fuzzy
+msgid "Su_n"
 msgstr "Вск"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Task List"
-msgstr "Список заданий"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "T_hu"
+msgstr "Чтв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #, fuzzy
-msgid "Tasks due today:"
-msgstr "Задания установленные на сегодня"
+msgid "T_ue"
+msgstr "Втр"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Thu"
-msgstr "Чтв"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Задания установленные на сегодня"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Четверг"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr "Время"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Time divisions:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr "Часовой пояс: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#, fuzzy
+msgid "Time di_visions:"
 msgstr "Разделители времени:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr "Формат времени:"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Вторник"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Среда"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
+msgid "Work Week"
+msgstr "Рабочая неделя"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12-часовой (ДП/ПП)"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Time zone:"
-msgstr "Часовой пояс: "
+#, fuzzy
+msgid "_24 hour"
+msgstr "24-часовой"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Tue"
-msgstr "Втр"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Вторник"
+#, fuzzy
+msgid "_Compress weekends in month view"
+msgstr "Сжать выходные дни в просмотре месяца"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Wed"
-msgstr "Срд"
+#, fuzzy
+msgid "_Display"
+msgstr "Отобразить"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Среда"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Конец дня:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Work Week"
-msgstr "Рабочая неделя"
+#, fuzzy
+msgid "_Fri"
+msgstr "Пят"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_General"
+msgstr "Общее"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Скрыть удаленные сообщения"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Mon"
+msgstr "Пон"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Other"
+msgstr "Другой"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Sat"
+msgstr "Суб"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "_Task List"
+msgstr "Список заданий"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Wed"
+msgstr "Срд"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr "до начала встречи"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2592,62 +3735,57 @@ msgstr ""
 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:630 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:634 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (Выполнено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:636 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Выполнено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:641 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:643 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Условленная дата"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Правка встречи"
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Задание - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:465
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальная запись - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:479
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Нет итога"
 
-#: calendar/gui/dialogs/comp-editor.c:843 mail/mail-callbacks.c:1477
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Переписать файл?"
 
-#: calendar/gui/dialogs/comp-editor.c:847 mail/mail-callbacks.c:1482
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2655,12 +3793,12 @@ msgstr ""
 "Файл с таким названием уже существует.\n"
 "Переписать его?"
 
-#: calendar/gui/dialogs/comp-editor.c:910 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: calendar/gui/dialogs/comp-editor.c:1063
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2706,24 +3844,20 @@ msgstr "Вы уверены в том, что хотите удалить %d заданий?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Вы уверены в том, что хотите удалить %d журнальных записей?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr "Выбрать часовой пояс"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "Выделение:"
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#, fuzzy
+msgid "Addressbook..."
+msgstr "Адресная книга"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Часовые пояса"
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#, fuzzy
+msgid "Delegate To:"
+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/e-delegate-dialog.glade.h:3
+#, fuzzy
+msgid "Enter Delegate"
+msgstr "Удаленное"
 
 #: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
@@ -2752,6 +3886,7 @@ msgstr "Занят"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Классификация"
 
@@ -2779,6 +3914,7 @@ msgid "Pu_blic"
 msgstr "Общее"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Показать время как"
 
@@ -2797,84 +3933,84 @@ msgstr "Время начала:"
 
 #: calendar/gui/dialogs/meeting-page.c:576
 #: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1179
-#: calendar/gui/dialogs/meeting-page.c:1247
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr "Индивидуальное"
 
 #: calendar/gui/dialogs/meeting-page.c:578
 #: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1248
+#: calendar/gui/dialogs/meeting-page.c:1252
 msgid "Group"
 msgstr "Группа"
 
 #: calendar/gui/dialogs/meeting-page.c:580
 #: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1249
+#: calendar/gui/dialogs/meeting-page.c:1253
 msgid "Resource"
 msgstr "Источник"
 
 #: calendar/gui/dialogs/meeting-page.c:582
 #: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1250
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr "Комната"
 
 #: calendar/gui/dialogs/meeting-page.c:611
 #: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1263
+#: calendar/gui/dialogs/meeting-page.c:1267
 msgid "Chair"
 msgstr "Председатель"
 
 #: calendar/gui/dialogs/meeting-page.c:613
 #: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1181
-#: calendar/gui/dialogs/meeting-page.c:1264
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "Требуемые участники"
 
 #: calendar/gui/dialogs/meeting-page.c:615
 #: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1265
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Дополнительные участники"
 
 #: calendar/gui/dialogs/meeting-page.c:617
 #: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1266
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:663
 #: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1189
-#: calendar/gui/dialogs/meeting-page.c:1292
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 msgid "Needs Action"
 msgstr "Добавить действие"
 
 #: calendar/gui/dialogs/meeting-page.c:665
 #: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1293
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr "Принято"
 
 #: calendar/gui/dialogs/meeting-page.c:667
 #: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1294
+#: calendar/gui/dialogs/meeting-page.c:1298
 msgid "Declined"
 msgstr "Отклонено"
 
 #: calendar/gui/dialogs/meeting-page.c:669
 #: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1295
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Экспериментальный"
 
 #: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1296
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Удаленное"
@@ -2889,38 +4025,89 @@ msgid "That person is already attending the meeting!"
 msgstr "Этот человек уже участвует в совещании!"
 
 #: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Телефон в машине"
 
 #: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:838
-#: calendar/gui/dialogs/meeting-page.c:958
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr "Требуемые участники"
 
 #: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Optional Participants"
 msgstr "Дополнительные участники"
 
 #: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Дополнительные участники"
 
-#: calendar/gui/dialogs/meeting-page.c:916
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Отправленное"
 
-#: calendar/gui/dialogs/meeting-page.c:1467
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, 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/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 "Члены"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "Правила"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
+#: 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:85
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Тип"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -2965,7 +4152,7 @@ msgstr ""
 msgid "th"
 msgstr "ый"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr "случаи"
 
@@ -3014,22 +4201,18 @@ msgid "forever"
 msgstr "всегда"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid "label21"
-msgstr "метка26"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "month(s)"
 msgstr "месяцы"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "до"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "неделя"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "год"
 
@@ -3050,6 +4233,7 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% Выполнения:"
@@ -3063,7 +4247,7 @@ msgid "Progress"
 msgstr "Продвижение"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
@@ -3154,50 +4338,117 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3378
-#: calendar/gui/e-week-view.c:3230 mail/folder-browser.c:1278
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "Открыть"
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3387
-#: calendar/gui/e-week-view.c:3239 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Вырезать"
 
-#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3389
-#: calendar/gui/e-week-view.c:3241 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:32 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "Скопировать"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3364
-#: calendar/gui/e-day-view.c:3391 calendar/gui/e-week-view.c:3217
-#: calendar/gui/e-week-view.c:3243 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "Вставить"
 
-#: calendar/gui/e-calendar-table.c:862
+#: calendar/gui/e-calendar-table.c:863
 msgid "_Mark as Complete"
 msgstr "Пометить как выполненное"
 
-#: calendar/gui/e-calendar-table.c:864
+#: calendar/gui/e-calendar-table.c:865
 msgid "_Delete this Task"
 msgstr "Удалить это задание"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr "Пометить задания как выполненные"
 
-#: calendar/gui/e-calendar-table.c:869
+#: calendar/gui/e-calendar-table.c:870
 msgid "_Delete Selected Tasks"
 msgstr "Удалить выбранные задания"
 
-#: calendar/gui/e-calendar-table.c:1129
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 msgstr "Щелкните здесь для добавления задачи"
 
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+#, fuzzy
+msgid "Categories"
+msgstr ""
+"\n"
+"Категории: "
+
+#: 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
+#, fuzzy
+msgid "Completion Date"
+msgstr "Выполнено"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Due Date"
+msgstr "Условленная дата:"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+#, fuzzy
+msgid "End Date"
+msgstr "Дата"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+#, fuzzy
+msgid "Priority"
+msgstr "Приоритет:"
+
+#: calendar/gui/e-calendar-table.etspec.h:13
+#, fuzzy
+msgid "Start Date"
+msgstr "Дата начала:"
+
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
+#, fuzzy
+msgid "Summary"
+msgstr "Итог:"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+#, fuzzy
+msgid "Task sort"
+msgstr "Список заданий"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
@@ -3229,123 +4480,229 @@ msgstr "д.п."
 msgid "pm"
 msgstr "п.п."
 
-#: calendar/gui/e-day-view.c:3357
-msgid "New _Appointment"
-msgstr "Новая встреча"
-
-#: calendar/gui/e-day-view.c:3359 calendar/gui/e-week-view.c:3212
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr "Новое ежедневное событие"
 
-#: calendar/gui/e-day-view.c:3369 calendar/gui/e-week-view.c:3222
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Перейти к сегодняшнему дню"
 
-#: calendar/gui/e-day-view.c:3371 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 msgid "_Go to Date..."
 msgstr "Перейти к дате..."
 
-#: calendar/gui/e-day-view.c:3380 calendar/gui/e-week-view.c:3232
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 msgid "_Delete this Appointment"
 msgstr "Удалить эту встречу"
 
-#: calendar/gui/e-day-view.c:3399 calendar/gui/e-week-view.c:3257
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 msgid "Make this Occurrence _Movable"
 msgstr "Сделать эту вхождение перемещаемым"
 
-#: calendar/gui/e-day-view.c:3401 calendar/gui/e-week-view.c:3259
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: calendar/gui/e-day-view.c:3403 calendar/gui/e-week-view.c:3261
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: calendar/gui/e-itip-control.c:697
-msgid "This is an event that can be added to your calendar."
-msgstr "Это событие можно занести в ваш календарь."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is a meeting request."
-msgstr "Это запрос совещания."
+#: calendar/gui/e-itip-control.c:618
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Дополнительная информация"
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Совещание"
+
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Время завершения собрания:"
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "Это запрос совещания."
+
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Совещание"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Выбрать действие"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:715 calendar/gui/e-itip-control.c:755
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Это сообщение в настоящий момент не доступно"
+msgid "Bad Meeting Message"
+msgstr "Поиск в сообщении"
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Информация"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:752
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "было после"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Ответить"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "Видимо папка невостановимо испорчена."
+msgid "Task Cancellation"
+msgstr "Отменить операцию"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Сообщение календаря"
 
-#: calendar/gui/e-itip-control.c:856
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Необходимая информация"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Необходимая информация"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:880
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:992
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Предыдущее сообщение"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "Не удалось обновить ваш файл календаря!\n"
 
-#: calendar/gui/e-itip-control.c:1018
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Дата выполнения:"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Не удалось открыть ваш файл календаря!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% Выполнения:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Дата отправки"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3393,16 +4750,16 @@ msgstr "Невозможно загрузить задание в \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод необходимый для загрузки \"%s\" не поддерживается"
 
-#: calendar/gui/e-week-view.c:3210 calendar/gui/e-week-view.c:3248
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 msgid "New _Appointment..."
 msgstr "Новая встреча..."
 
-#: calendar/gui/gnome-cal.c:1248
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Невозможно открыть папку \"%s\""
 
-#: calendar/gui/gnome-cal.c:1259
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод необходимый для открытия \"%s\" не поддерживается"
@@ -3463,7 +4820,7 @@ msgstr "Октябрь"
 msgid "September"
 msgstr "Сентябрь"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3619,12 +4976,6 @@ msgstr "Пт"
 msgid "Sa"
 msgstr "Cб"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-shortcuts.c:1025
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Задания"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3658,9 +5009,8 @@ msgid "Print Calendar"
 msgstr "Напечатать календарь"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1846 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Просмотр печати"
 
@@ -3799,7 +5149,12 @@ msgid ""
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:967
+#: calendar/pcs/query.c:805
+#, fuzzy
+msgid "is-completed? expects 0 arguments"
+msgstr "Синтаксическая ошибка в параметрах или аргументах"
+
+#: calendar/pcs/query.c:1008
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -3878,10 +5233,6 @@ msgstr "Невозможно открыть сообщение"
 msgid "Syncing folder"
 msgstr "Синхронизация папки"
 
-#: camel/camel-filter-driver.c:699 camel/camel-filter-driver.c:815
-msgid "Complete"
-msgstr "Выполнено"
-
 #: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
@@ -4117,7 +5468,7 @@ msgid "Connection cancelled"
 msgstr "Соединение отменено"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не удалось подключиться к %s (порт %d): %s"
@@ -4264,46 +5615,67 @@ msgstr "Неизвестное состоиние идентификации."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "Пароль"
 
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Источник"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Сбой компиляции регулярного выражения: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL \"%s\" нуждается в компоненте имени пользователя"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL \\\"%s\\\" нуждается в компоненте хоста"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL \\\"%s\\\" нуждается в компоненте пути"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "Распознавание: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ошибка в разрешении имени: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Сбой поиска хоста: %s: хост не найден"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Сбой поиска хоста: %s: причина неизвестна"
@@ -4368,7 +5740,7 @@ msgstr "Сбойное сообщение %d"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4376,7 +5748,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4473,22 +5845,22 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr "Сохранение сообщений"
 
-#: camel/providers/imap/camel-imap-folder.c:1478
-#: camel/providers/imap/camel-imap-folder.c:1902
+#: camel/providers/imap/camel-imap-folder.c:1491
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Это сообщение в настоящий момент не доступно"
 
-#: camel/providers/imap/camel-imap-folder.c:1620
-#: camel/providers/imap/camel-imap-folder.c:1701
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1626
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Сохранение сообщений"
 
-#: camel/providers/imap/camel-imap-folder.c:1935
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Невозможно найти тело сообщения в ответе FETCH."
 
@@ -4505,7 +5877,7 @@ msgstr "Проверка новое почты"
 msgid "Check for new messages in all folders"
 msgstr "Проверка новой почты во всех папках"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:653
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Папки"
 
@@ -4547,7 +5919,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сервер %s не поддерживает затребованный тип идентификации %s"
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Идентификация типа %s не поддерживается"
@@ -4558,7 +5930,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sПожалуйста, введите пароль IMAP для %s@%s"
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Вы не ввели пароль."
 
@@ -4573,12 +5945,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:327
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Нет такой папки %s"
 
-#: camel/providers/imap/camel-imap-store.c:1023
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4837,13 +6209,14 @@ msgstr "Папка \"%s\" не пуста. Не удалена."
 #. 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"
+#, fuzzy
+msgid "Summarizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr "Не удалось открыть папку: %s: итог с позиции %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4853,24 +6226,22 @@ 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"
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
 msgstr "Не удалось суммировать папку: %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:1536
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "Не удалось открыть папку для суммаризации: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -4973,6 +6344,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Не удалось суммировать папку: %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5064,35 +6446,35 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Не удалось открыть или создать файл .newsrc для %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:193
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Получение итога POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Не удалось проверить наличие новых сообщений на POP сервере: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:238
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Не удалось открыть папку: список сообщений был неполон."
 
-#: camel/providers/pop3/camel-pop3-folder.c:331
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Не удалось получить сообщение: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:347
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Не удалось получить сообщение с POP сервера %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:370
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Нет сообщения с uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Получение сообщения %d по POP"
@@ -5110,7 +6492,7 @@ msgstr "Сохранять сообщения на сервере"
 msgid "Delete after %s day(s)"
 msgstr "Удалять через %s дней"
 
-#: 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:53
 msgid "POP"
 msgstr "POP"
 
@@ -5206,7 +6588,7 @@ msgid "No such folder `%s'."
 msgstr "Нет такой папки \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5259,7 +6641,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:63
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5269,123 +6651,123 @@ msgstr ""
 "Для доставки почты с помощью подключения к удаленному почтовому узлу по "
 "протоколу SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Синтаксическая ошибка, команда не распознана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Команда не реализована"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "Параметр команды не реализован"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr "Состояние системы или ответ справки системы"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Справочное сообщение"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Сервис готов"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Сервис закрывает канал передачи"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "Сервис не доступен, закрытие канала передачи"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "Запрошенное почтовое действие выполнено"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr "Не локальный пользователь; будет отправлено к <путь-отправки>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Запрошенное действие с почтой не выполнено: почтовый ящик не доступен"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Запрошенное действие не выполнено: почтовый ящик не доступен"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "Запрошенное действие отменено: ошибка при обработке"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "Пользователь не локальный; пожалуйста попробуйте <путь-пересылки>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Запрошенное действие не выполнено: недостаточно системного хранилища"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "Запрошенное действие не выполнено: название почтового ящика недопустимо"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Начало ввода почты; окончание после <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Сбой транзакции"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "Необходима передача пароля"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "Слишком слабый механизм идентификации"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Для запрошенного механизма идентификации требуется шифрование"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Временный сбой идентификации"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Идентификация требуется"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP сервер %s не поддерживает затребованный тип идентификации %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sПожалуйста, введите пароль SMTP для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5396,127 +6778,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP сервер %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Доставка SMTP почты через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr "Невозможно отправить сообщение: не определен адрес отправителя."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr "Невозможно отправить сообщение: неправильный адрес отправителя."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Превышено время ожидания ответа на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Ошибка ответа HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:760
 msgid "SMTP Authentication"
 msgstr "Идентификация SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:766
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Превышено время ожидания ответа на запрос AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Превышено время ожидания ответа на запрос AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "Отрицательный ответ идентификации от сервера.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на MAIL FROM: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Ошибка ответа MAIL FROM: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на RCPT TO: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Ошибка ответа RCPT TO: %s: почта не отправлена."
 
-#: camel/providers/smtp/camel-smtp-transport.c:969
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на DATA: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:988
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Ошибка ответа DATA: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Превышено время отправки DATA: сообщение прервано: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Ошибка ответа DATA: сообщение прервано: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Превышено время ожидания ответа на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Ошибка ответа RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Превышено время ожидания ответа на QUIT: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Ошибка ответа QUIT: %s: не фатально"
@@ -5546,7 +6928,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "вложение"
 
@@ -5637,7 +7019,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Присоединить файл"
 
-#: composer/e-msg-composer.c:687
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5646,7 +7028,7 @@ msgstr ""
 "Невозможно открыть файл \"%s\":\n"
 "%s"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5655,29 +7037,29 @@ msgstr ""
 "Ошибка при чтении файла %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:890
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr "Предупреждение!"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "Файл существует, переписать?"
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Ошибка сохранения файла: %s"
 
-#: composer/e-msg-composer.c:943
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ошибка при загрузке файла: %s"
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5685,17 +7067,17 @@ msgstr ""
 "Не удалось открыть папку черновиков для этого счёта.\n"
 "Хотите использовать папку черновиков по умолчанию?"
 
-#: composer/e-msg-composer.c:1064
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Ошибка сохранения файла: %s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Не удалось получить сообщение с POP сервера %s: %s"
 
-#: composer/e-msg-composer.c:1078
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5704,7 +7086,7 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5713,7 +7095,7 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5722,16 +7104,16 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1193
+#: composer/e-msg-composer.c:1172
 #, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution нашла почтовые файлы Pine.\n"
 "Хотите импортировать их в Evolution?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5741,25 +7123,25 @@ msgstr ""
 "\n"
 "Вы хотите сохранить изменения?"
 
-#: composer/e-msg-composer.c:1348 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: composer/e-msg-composer.c:1520
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "Вставить текстовый файл..."
 
-#: composer/e-msg-composer.c:1894 composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Создать сообщение"
 
-#: composer/e-msg-composer.c:2384
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Невозможно создать окно редактора."
 
@@ -5787,57 +7169,103 @@ msgstr "визитная карточка"
 msgid "calendar information"
 msgstr "информация календаря"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "содержит"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "не содержит"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "не содержит"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Имя содержит"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Описание содержит"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Имя содержит"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Имя содержит"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %m/%d/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5845,13 +7273,13 @@ 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:303
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5949,7 +7377,7 @@ msgstr "время относительно текущего"
 msgid "Compare against"
 msgstr "Сравнивать с"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "сейчас"
 
@@ -5961,11 +7389,15 @@ msgstr " назад"
 msgid "ago"
 msgstr "назад"
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<щелкните здесь для выбора даты>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Правила фильтра"
 
@@ -5987,7 +7419,7 @@ msgstr ""
 "Пожалуйста, вернитесь и укажите правильную папку для доставки почты."
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:790
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Выбрать папку"
 
@@ -5999,7 +7431,7 @@ msgstr "Ввести URI папки"
 msgid "<click here to select a folder>"
 msgstr "<щелкните здесь для выбора папки>"
 
-#: filter/filter-input.c:197
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6049,30 +7481,22 @@ msgid "outgoing"
 msgstr "исходящие"
 
 #: filter/filter.glade.h:1
-msgid "Add"
-msgstr "Добавить"
-
-#: filter/filter.glade.h:3
-msgid "Edit"
-msgstr "Правка"
-
-#: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Правка фильтров"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Правка вирт.папок"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Входящие"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Исходящие"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Виртуальные папки"
 
@@ -6096,195 +7520,194 @@ msgstr "со всеми локальными и активными удалёнными папками"
 msgid "with all local folders"
 msgstr "со всеми локальными папками"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Связать цвет"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Связать подсчет"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Вложения"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "содержит"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Скопировать в папку"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Дата получения"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Дата отправки"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Удаленное"
 
-#: 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
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Не существует"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Черновик"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "заканчивается на"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Существует"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "cуществуют"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Выражение"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Важное"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "является"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "больше чем"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "меньше чем"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "не является"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Список рассылки"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Тело сообщения"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "Заголовок сообщения"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "Сообщение было получено"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "Сообщение было отправлено"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Переместить в папку"
 
-#: 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
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Прочитанное"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Получатели"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Совпадение рег.выражения"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Ответить"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Подсчет"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1070
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Отправитель"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Установить состояние"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Размер"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "звучит как"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Исходный счет"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Специфический заголовок"
 
+#: filter/libfilter-i18n.h:32
+msgid "Stop Processing"
+msgstr "Остановить обработку"
+
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "Тема"
+
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "содержит"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "не содержит"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "не заканчивается на"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "не существует."
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "звучит не как"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "не начинается с"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "заканчивается на"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "cуществуют"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "больше чем"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "меньше чем"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "не является"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "является"
+
 #: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "начинается с"
+msgid "on or after"
+msgstr "на или после"
 
 #: filter/libfilter-i18n.h:49
-msgid "Status"
-msgstr "Состояние"
+msgid "on or before"
+msgstr "на или до"
 
 #: filter/libfilter-i18n.h:50
-msgid "Stop Processing"
-msgstr "Остановить обработку"
+msgid "sounds like"
+msgstr "звучит как"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:889
-msgid "Subject"
-msgstr "Тема"
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "начинается с"
 
 #: filter/libfilter-i18n.h:52
 msgid "was after"
@@ -6315,14 +7738,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Импортировать"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Почта"
 
@@ -6350,11 +7772,11 @@ msgstr ""
 "Evolution нашла файлы GnomeCard.\n"
 "Хотите импортировать их в Evolution?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Установки"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6411,163 +7833,183 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr "Настройка почты"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Вирт.папка по списку рассылки"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr "Эта папка не может содержать сообщения."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr "Свойства..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr "Изменить свойства этой папки"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Почтовое сообщение"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Почтовое сообщение"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "Не удалось зарегистрировать хранилище с помощью оболочки"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Свойства для \"%s\""
 
-#: mail/folder-browser-ui.c:258
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Свойства"
 
-#: mail/folder-browser.c:232 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Не удалось создать временный каталог: %s"
 
-#: mail/folder-browser.c:900
+#: mail/folder-browser.c:909
 msgid "Create vFolder from Search"
 msgstr "Создать вирт.папку по поиску"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "Вирт.папка по теме"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "Вирт.папка по отправителю"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "Вирт.папка по получателю"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "Вирт.папка по списку рассылки"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Фильтр по теме"
 
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Фильтр по отправителю"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Фильтр по получателям"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:1280
-msgid "Resend"
-msgstr "Перепослать"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "Печать сообщения..."
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:96
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Сохранить как..."
 
-#: mail/folder-browser.c:1284 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "Печать"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Ответить отправителю"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Ответить в список"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Ответить всем"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "Переслать"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Пометить как прочитанное"
 
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Пометить как непрочтенное"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr "Пометить как важное"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr "Пометить как неважное"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "Переместить в папку..."
 
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "Скопировать в папку..."
 
-#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "Восстановить"
 
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "Добавить отправителя в адресную книгу"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Применить фильтры"
 
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "Создать правило из сообщения"
 
-#: mail/folder-browser.c:1487
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:1488
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "Вирт.папка по списку рассылки"
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Фильтр по списку рассылки (%s)"
 
-#: mail/folder-browser.c:1491
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Вирт.папка по списку рассылки (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Дополнительная информация"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Фабрика для импорта файлов mbox в Evolution"
@@ -6628,15 +8070,15 @@ msgid "Evolution News Editor"
 msgstr "Редактор новостей Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Редактор счетов Evolution"
 
-#: mail/mail-account-gui.c:980
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "Сохранить подпись"
 
-#: mail/mail-account-gui.c:986
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6646,38 +8088,43 @@ msgstr ""
 "\n"
 "Вы хотите сохранить изменения?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr "(Исх.значения)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Отключить"
 
-#: mail/mail-accounts.c:176
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Включить"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "Вы уверены что хотите удалить этот счет?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr "Не удалять"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr "Действительно удалить счёт?"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "Вы уверены что хотите удалить этот новый счет?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:758
-msgid "Evolution Account Manager"
-msgstr "Диспетчер счетов Evolution"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "Установки почты..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6703,7 +8150,7 @@ msgstr "%s список рассылки"
 msgid "Add Filter Rule"
 msgstr "Добавить правило фильтра"
 
-#: 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"
@@ -6715,7 +8162,7 @@ msgstr ""
 "отправлять, принимать или редактировать почту.\n"
 "Вы хотите настроить это сейчас?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6723,7 +8170,7 @@ msgstr ""
 "Вы должны настроить пользователя\n"
 "до того как вы сможете послать почту."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6731,11 +8178,11 @@ msgstr ""
 "Вы должны настроить передачу почты\n"
 "до того как вы сможете послать почту."
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Вы не установили метод транспортировки почты"
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6743,7 +8190,7 @@ msgstr ""
 "Это сообщение не имеет темы.\n"
 "Послать его?"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6751,37 +8198,36 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr "Вы должны указать получателей, чтобы отправить это сообщение."
 
-#: mail/mail-callbacks.c:389
+#: mail/mail-callbacks.c:390
 msgid "You must configure an account before you can send this email."
 msgstr "Вы должны настроить счет до того как вы сможете послать почту."
 
 #: mail/mail-callbacks.c:632
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "%s, %s написал:"
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Пересланное сообщение:\n"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Переместить сообщение в"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Скопировать сообщения в"
 
-#: mail/mail-callbacks.c:1353
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Вы уверены что вы хотите править все %d сообщений?"
 
-#: mail/mail-callbacks.c:1375
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6789,7 +8235,7 @@ msgstr ""
 "Вы можете править только сообщения\n"
 "сохраненные в папке \"Черновики\"."
 
-#: mail/mail-callbacks.c:1409
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6797,24 +8243,41 @@ msgstr ""
 "Вы можете только перепослать сообщения\n"
 "из папки \"Отправленные\"."
 
-#: mail/mail-callbacks.c:1421
+#: mail/mail-callbacks.c:1434
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Вы уверены что вы хотите править все %d сообщений?"
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "Сообщение не выбрано"
 
-#: mail/mail-callbacks.c:1526
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Сохранить сообщение как..."
 
-#: mail/mail-callbacks.c:1528
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Сохранить сообщения как..."
 
-#: mail/mail-callbacks.c:1751
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Не спрашивать снова"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6823,60 +8286,70 @@ msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1761
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Фильтры"
 
-#: mail/mail-callbacks.c:1807
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Печать сообщения"
 
-#: mail/mail-callbacks.c:1853
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Сбой печати сообщения"
 
-#: mail/mail-callbacks.c:1937
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Вы уверены что хотите открыть все %d сообщений в отдельных окнах?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "Пожалуйста, введите ваше имя и эл.адрес ниже. \"Дополнительные\" поля не "
 "обязательны для заполнения, если только вы не хотите включать эту информацию "
 "в отправляемую вами почту."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Пожалуйста, введите ниже информацию о вашем сервере входящей почты. Если вы "
 "не знаете какого типа сервер вы используете, свяжитесь с вашим системным "
 "администратором или провайдером услуг Интернет."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Пожалуйста, введите ниже информацию о вашем сервере исходящей почты. Если вы "
 "не знаете какой протокол вы используете, свяжитесь с вашим системным "
 "администратором или провайдером услуг Интернет."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "Вы почти закончили процесс настройки почты. Наименование, сервер входящей "
 "почты и метод передачи исходящей почты, которые вы предоставили будут "
@@ -6885,15 +8358,26 @@ msgstr ""
 "отображения."
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Помощник по счетам Evolution"
 
-#: mail/mail-config.c:1570
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Входящие"
+
+#: mail/mail-config.c:1809
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1641 mail/mail-config.c:1644
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Подключение к серверу..."
 
@@ -6933,7 +8417,7 @@ msgstr ""
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Вложение"
 
@@ -6985,11 +8469,15 @@ msgstr ""
 msgid "Digital IDs..."
 msgstr ""
 
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Отобразить"
+
 #: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Сделано"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Черновики"
 
@@ -7001,205 +8489,207 @@ msgstr "Папка черновиков:"
 msgid "E_nable"
 msgstr "Включить"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Сохранить текущий файл под другим именем"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Правка..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Включено"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "HTML-файл подписи:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Именование"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Встроенное"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Настройка почты"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Расположение почтового ящика"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Сделать моим счетом по умолчанию"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "Сервер NNTP"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Новые"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Дополнительная информация"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Почтовый каталог Qmail "
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "Процитированное"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Получение эл.почты"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Получение эл.почты"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Получение параметров"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Необходимая информация"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Безопасность"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Выбрать файл журнала для фильтров..."
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Выбрать программу PGP"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Отправленное"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Отправленные сообщения и черновики"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Папка отправленных сообщений:"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Настройка сервера"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Тип сервера:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
 msgstr "Сервер требует идентификации"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Источник"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Информация об источнике"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Источники"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Специальные папки"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Стандартный файл Unix mbox"
 
-#: mail/mail-config.glade.h:83
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Тип"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr "Использовать защищенное подключение (SSL)"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7207,103 +8697,103 @@ msgstr ""
 "\n"
 "Нажмите \"След.\" для начала."
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
 msgstr "Автоматически проверять почту каждые"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
 msgstr " Проверка поддерживаемых типов "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
 msgstr "Эл.адрес:"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
 msgstr "Очищать корзину при выходе"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:98
 msgid "_Full Name:"
 msgstr "Полное имя:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr "Выделять цитаты с помощью"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
 msgstr "Хост:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
 msgstr "Загрузить изображения, если отправитель есть в адресной книге"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
 msgstr "Помечать сообщения как \"Прочитанные\" после:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "Имя:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 msgid "_Organization:"
 msgstr "Организация:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr "Путь к программе PGP:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "Путь:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "Запомнить этот пароль"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "По умолчанию отправлять почту в формате HTML."
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "Имя пользователя:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "секунд."
 
@@ -7351,76 +8841,82 @@ msgstr "Невозможно создать окно редактора."
 msgid "Could not create a S/MIME decode context."
 msgstr "Невозможно создать окно редактора."
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Сохранить вложение"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Сохранить на диске..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Встроенный просмотр"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Встроенный просмотр (через %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Скрыть"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Внешняя программа просмотра"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Загрузка содержимого сообщения"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "Открыть ссылку в браузере"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Скопировать ссылку"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr "Сохранить ссылку как"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 msgid "Save Image as..."
 msgstr "Сохранить изображение как..."
 
-#: mail/mail-folder-cache.c:146
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr "Новых %d"
 
-#: mail/mail-folder-cache.c:152 mail/mail-folder-cache.c:159
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:153
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr "Скрытых %d"
 
-#: mail/mail-folder-cache.c:162
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Удаленное"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr "Неотправленных %d"
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr "Всего %d"
@@ -7442,7 +8938,7 @@ msgstr "Дата"
 msgid "Bad Address"
 msgstr "Неправильный эл.адрес"
 
-#: mail/mail-format.c:878
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "От"
 
@@ -7450,7 +8946,7 @@ msgstr "От"
 msgid "Reply-To"
 msgstr "Ответить"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Кому"
 
@@ -7514,17 +9010,22 @@ msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:459
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Нет такой папки %s"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Открытие \"%s\""
 
-#: mail/mail-local.c:749
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Изменение папки \"%s\" в формат \"%s\""
 
-#: mail/mail-local.c:870
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7597,7 +9098,7 @@ msgstr "Отправка сообщения %d из %d"
 msgid "Failed on message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Выполнено."
 
@@ -7629,7 +9130,7 @@ msgid "Scanning folders in \"%s\""
 msgstr "Считывание папок в \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Мусорная корзина"
 
@@ -7637,7 +9138,7 @@ msgstr "Мусорная корзина"
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Открытие папки \"%s\""
@@ -7647,35 +9148,45 @@ msgstr "Открытие папки \"%s\""
 msgid "Opening store %s"
 msgstr "Открытие хранилища %s"
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Открытие папки \"%s\""
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "Удаление папки \"%s\""
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Синхронизация папки"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Обновление папки"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Вычеркивание папки"
 
-#: mail/mail-ops.c:1671
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получение сообщения %s"
 
-#: mail/mail-ops.c:1738
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Получение сообщений"
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Сохранение %d сообщений"
 
-#: mail/mail-ops.c:1904
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7684,7 +9195,7 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1930
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7693,11 +9204,11 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2004
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Сохранение вложения"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7706,12 +9217,12 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Невозможно записать данные: %s"
 
-#: mail/mail-ops.c:2118
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
@@ -7724,31 +9235,31 @@ msgstr "Поиск"
 msgid "(Untitled Message)"
 msgstr "(Неозаглавленное сообщение)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 msgid "Untitled Message"
 msgstr "Неозаглавленное сообщение"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 msgid "Empty Message"
 msgstr "Пустое сообщение"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "Поиск в сообщении"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "Учитывать регистр"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr "Поиск вперёд"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Поиск:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Совпадения:"
 
@@ -7768,7 +9279,7 @@ msgstr "Обновление..."
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Отменено."
 
@@ -7790,15 +9301,15 @@ msgstr "Пересланное сообщение - %s"
 msgid "Forwarded message"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 msgid "Forwarded Message"
 msgstr "Пересланное сообщение"
 
-#: mail/mail-vfolder.c:282
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "Вирт.папки"
 
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Новая вирт.папка"
 
@@ -7811,108 +9322,153 @@ msgstr "(Без темы)"
 msgid "%s - Message"
 msgstr "%s - Сообщение"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Непрочитанное"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Прочитанное"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Отвечено"
 
-#: mail/message-list.c:632
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "Множество непросмотренных сообщений"
 
-#: mail/message-list.c:633
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: mail/message-list.c:637
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Низкий"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "Высокий"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:929
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:931
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2305
+#: mail/message-list.c:2312
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
-#: mail/message-list.c:2317
-msgid "Updating message list"
-msgstr "Обновление списка сообщений"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
 
-#: mail/subscribe-dialog.c:166
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Received"
+msgstr "Дата получения"
+
+#: mail/message-list.etspec.h:7
+#, fuzzy
+msgid "Size"
+msgstr "Размер:"
+
+#: mail/subscribe-dialog.c:174
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/subscribe-dialog.c:267
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Подписывание на папку \"%s\""
 
-#: mail/subscribe-dialog.c:269
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Отписывание от папки \"%s\""
 
-#: mail/subscribe-dialog.c:1190
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Папка"
 
-#: mail/subscribe-dialog.c:1432
+#: mail/subscribe-dialog.c:1490
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Сообщение не выбрано"
 
-#: mail/subscribe-dialog.c:1489
+#: mail/subscribe-dialog.c:1547
 #, fuzzy
 msgid "Please select a server."
 msgstr "Выбрать сервис"
 
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Обновить список"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Все папки:"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Показать станции:"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Описание:"
+
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Подписаться"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Отказаться"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Компонент Evolution для Executive Summary."
@@ -7921,7 +9477,11 @@ msgstr "Компонент Evolution для Executive Summary."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Фабрика для компонента Executive Summary программы Evolution."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 "Невозможно инициализировать компонент Executive Summary программы Evolution."
@@ -7942,35 +9502,44 @@ msgstr "%k:%M"
 msgid "%a %l:%M%p"
 msgstr "%a %k:%M"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Итог почты"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr "Цитата дня"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:881
+#: my-evolution/e-summary-preferences.c:889
 msgid "Name:"
 msgstr "Имя:"
 
-#: my-evolution/e-summary-preferences.c:1403
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Установка Evolution"
+msgid "Summary Settings"
+msgstr "Итог содержит"
 
 #: my-evolution/e-summary-rdf.c:281
 #, fuzzy
@@ -7982,6 +9551,11 @@ msgstr "При загрузке файла календаря возникла ошибка."
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Ошибка при загрузке календаря</b>"
 
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Новая папка"
+
 #: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
@@ -7991,28 +9565,33 @@ msgstr "Показать задания"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Погода"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Разделы:"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
-msgstr "%A, %e %B %Y"
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %d, %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolution"
+msgid "Print Summary"
+msgstr "Первый"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "Сбой печати сообщения"
 
 #: my-evolution/main.c:52
@@ -8021,11 +9600,11 @@ msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 
 #: my-evolution/metar.c:29
-msgid " F"
+msgid "╟F"
 msgstr ""
 
 #: my-evolution/metar.c:29
-msgid " C"
+msgid "╟C"
 msgstr ""
 
 #: my-evolution/metar.c:33
@@ -9248,10 +10827,6 @@ msgstr "Все папки:"
 msgid "All news _feeds:"
 msgstr "Отвечено"
 
-#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1024
-msgid "Calendar"
-msgstr "Календарь"
-
 #: my-evolution/my-evolution.glade.h:7
 msgid "How many days should the calendar display at once?"
 msgstr "Сколько дней должен календарь отображать одновременно?"
@@ -9352,19 +10927,7 @@ msgstr "Погода"
 msgid "_imperial"
 msgstr "Апрель"
 
-#: my-evolution/my-evolution.glade.h:32
-msgid "label27"
-msgstr "метка26"
-
-#: my-evolution/my-evolution.glade.h:33
-msgid "label39"
-msgstr "метка26"
-
-#: my-evolution/my-evolution.glade.h:34
-msgid "label40"
-msgstr "метка26"
-
-#: my-evolution/my-evolution.glade.h:35
+#: my-evolution/my-evolution.glade.h:31
 msgid "m_etric"
 msgstr ""
 
@@ -9380,7 +10943,16 @@ msgstr "Показать подробности"
 msgid "Cancel Operation"
 msgstr "Отменить операцию"
 
-#: shell/e-local-storage.c:551
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr "Входящие"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Специальные папки"
@@ -9434,7 +11006,7 @@ msgid ""
 "`%s'."
 msgstr "При чтении файла возникла ошибка."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9445,7 +11017,7 @@ msgstr ""
 "Пожалуйста, переместите его, чтобы позволить\n"
 "установить файлы пользователя Evolution."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9454,7 +11026,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9481,48 +11053,57 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Скопировать папку"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Переместить папку"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Невозможно удалить папку \"%s\":\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Удалить папку \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:377
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Вы уверены в том, что хотите удалить папку \"%s\"?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:452
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Переименовать папку \"%s\""
 
-#: shell/e-shell-folder-commands.c:456 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Переименовать"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:464
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Название папки:"
@@ -9552,11 +11133,11 @@ msgstr ""
 "Тип выбранной папки не подходит для\n"
 "запрошенного действия."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Новая..."
 
-#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Без заголовка)"
 
@@ -9596,7 +11177,7 @@ msgstr ""
 "Импортирование %s\n"
 "Импортирование элемента %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9645,7 +11226,7 @@ msgstr "Автоматическое"
 msgid "Filename:"
 msgstr "Имя файла:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Выбрать файл"
 
@@ -9653,11 +11234,11 @@ msgstr "Выбрать файл"
 msgid "File type:"
 msgstr "Тип файла:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Выбрать папку"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
@@ -9665,19 +11246,41 @@ msgstr ""
 msgid "Closing connections..."
 msgstr "Закрытие соединений..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Невозможно инициализировать оболочку Evolution: %s"
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy не был найден в вашем $PATH."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy не может быть запущен."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright (C) 1999-2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9687,90 +11290,90 @@ msgstr ""
 "ведения календарей и контактной информации для\n"
 "групповой работы в среде GNOME."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Перейти к папке..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr "Выберите папку, которую вы хотите открыть"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Создать новую группу закладок"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:702
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr "Работать в сети"
 
-#: shell/e-shell-view-menu.c:715 shell/e-shell-view-menu.c:728
-#: ui/evolution.xml.h:35
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Работать вне сети"
 
-#: shell/e-shell-view.c:177
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Папки не показаны)"
 
-#: shell/e-shell-view.c:1385
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1387
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1425
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1432
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1438
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:491
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Невозможно установить локальное хранилище -- %s"
 
-#: shell/e-shell.c:1405
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Оп-ля! Окно для \"%s\" неожиданно умерло. :-(\n"
 "Возможно это означает, что компонент %s рухнул."
 
-#: shell/e-shell.c:1609 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Ок"
 
-#: shell/e-shell.c:1611
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr "Недопустимые аргументы"
 
-#: shell/e-shell.c:1613
+#: shell/e-shell.c:1646
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "Не удалось зарегистрировать хранилище с помощью оболочки"
 
-#: shell/e-shell.c:1615
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1617 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "Обычная ошибка"
 
@@ -9868,7 +11471,7 @@ msgstr "Удалить эту группу закладок"
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Открыть в новом окне"
 
@@ -9886,70 +11489,64 @@ msgstr "Удалить эту группу закладок"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Удалить эту закладку из строки закладок"
 
-#: shell/e-shortcuts.c:620
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Ошибка сохранения закладок."
 
-#: shell/e-shortcuts.c:1019
+#: shell/e-shortcuts.c:1040
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Строка закладок"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-shortcuts.c:1023
-msgid "Inbox"
-msgstr "Входящие"
-
-#: shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Контакты"
-
-#: shell/e-storage-set-view.c:1464
-#, fuzzy
-msgid "My Evolution"
-msgstr "Evolution"
-
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Без имени)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Нет ошибки"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Папка с таким названием уже существует"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Указанный тип папки не допустим"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Ошибка ввода/вывода"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Недостаточно места для создания папки"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Указанная папка не найдена"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Функция не реализована для этого носителя"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Операция не поддерживается"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Указанный тип не поддерживается для этого носителя"
 
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Указанная папка не найдена"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
 #: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
@@ -9990,17 +11587,29 @@ msgstr ""
 "Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Средство импортирования Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Средство импортирования Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Выбрать файл"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "Средство импортирования Evolution.\n"
@@ -10021,11 +11630,12 @@ msgid "Don't ask me again"
 msgstr "Не спрашивать снова"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+#, fuzzy
+msgid "Evolution can import data from the following files:"
 msgstr "Evolution нашла следующие источники данных:"
 
 #: shell/main.c:95
-#, no-c-format, fuzzy
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -10066,29 +11676,29 @@ msgstr ""
 "С благодарностью\n"
 "Команда Evolution\n"
 
-#: shell/main.c:154
+#: shell/main.c:173
 msgid "Cannot access the Evolution shell."
 msgstr "Невозможно инициализировать оболочку Evolution."
 
-#: shell/main.c:163
+#: shell/main.c:184
 #, c-format
 msgid "Cannot initialize the Evolution shell: %s"
 msgstr "Невозможно инициализировать оболочку Evolution: %s"
 
-#: shell/main.c:221
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "Отключить заставку"
 
-#: shell/main.c:222
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr "Записывать отладочный вывод всех компонентов в файл."
 
-#: shell/main.c:261
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не удалось инициализировать компонентную систему Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Скопировать"
 
@@ -10104,11 +11714,11 @@ msgstr "Создать новый контакт"
 msgid "Create new contact list"
 msgstr "Создать новый список контактов"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Вырезать"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Вырезать выделение"
 
@@ -10116,93 +11726,97 @@ msgstr "Вырезать выделение"
 msgid "Delete selected contacts"
 msgstr "Удалить выбранные контакты"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Новый контакт"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "New List"
 msgstr "Новый список"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Вставить"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Вставить выделение"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Просмотр печатаемого календаря"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Печать выбранных контактов"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Удалить контакт"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Выбрать все"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Выбрать все контакты"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Send _contact to other"
-msgstr "Послать контакт другому"
-
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send _message to contact"
-msgstr "Послать сообщение к контакту"
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Послать сообщение к контакту..."
 
 #: ui/evolution-addressbook.xml.h:24
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Удалить контакт"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Послать сообщение к контакту"
+
+#: ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Послать контакт другому"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Стоп"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Остановить загрузку"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:29
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "Действия"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "Источники адресных книг..."
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "Контакты"
 
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact List"
 msgstr "Список контакты"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
-#: ui/evolution-contact-editor.xml.h:16 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "Контакты..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Печать..."
 
@@ -10211,16 +11825,18 @@ msgid "_Save as VCard"
 msgstr "Сохранить как VCard"
 
 #: ui/evolution-addressbook.xml.h:38
-msgid "_Search for contacts"
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "Поиск контактов"
 
 #: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "Выбрать все"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "Инструменты"
 
@@ -10229,109 +11845,131 @@ 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"
-msgstr "Создать новую встречу"
+#, fuzzy
+msgid "Create a New _Task"
+msgstr "Создать новое задание"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "Создать новую встречу"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Day"
+msgstr "День"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Удалить эту встречу"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Перейти к"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Перейти в прошлое"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Перейти в будущее"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Перейти к дате"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Перейти к указанной дате"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Перейти к настоящему времени"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Перейти к сегодняшнему дню"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "Месяц"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Новая встреча"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Новое задание"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Просмотр печатаемого календаря"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Напечатать календарь"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Напечатать этот календарь"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Просмотр печати"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "Необходимая информация"
+msgid "Print this calendar"
+msgstr "Напечатать этот календарь"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Показать 1 день"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Показать 1 месяц"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Показать 1 неделю"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Показать рабочую неделю"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "Рабочая неделя"
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "Week"
+msgstr "Неделя"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "Встреча..."
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "Установки календаря..."
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Day"
-msgstr "День"
-
-#: ui/evolution-calendar.xml.h:34
-msgid "_Month"
-msgstr "Месяц"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Необходимая информация"
 
-#: ui/evolution-calendar.xml.h:38
-msgid "_Week"
-msgstr "Неделя"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "Задание"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10342,15 +11980,16 @@ msgid "Close"
 msgstr "Закрыть"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Закрыть эту встречу"
+#, fuzzy
+msgid "Close this item"
+msgstr "Удалить этот элемент"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Удалить эту встречу"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Удалить этот элемент"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Главная панель инструментов"
 
@@ -10358,90 +11997,59 @@ msgstr "Главная панель инструментов"
 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
-msgid "Print S_etup"
-msgstr "Настройка печати"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Печать этого элемента"
 
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Печать..."
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Сохранить"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Сохранить этот список и закрыть окно диалога"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, 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:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "Файл"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Удалить этот элемент"
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Справка"
-
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Печать конверта..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
-msgid "Save"
-msgstr "Сохранить"
-
-#: ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Сохранить как..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Сохранить задание и закрыть окно диалога"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Послать контакт другому..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Просмотр онлайновой справки"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Послать сообщение к контакту..."
-
-#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
@@ -10472,21 +12080,21 @@ msgstr "Послать сообщение в список..."
 msgid "Cancel Mee_ting"
 msgstr "Отменить совещание"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 #, fuzzy
 msgid "Cancel the meeting for this item"
 msgstr "Изменить свойства этой папки"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Переслать как i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Переслать это сообщение"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10501,7 +12109,7 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr "Вставить встречу в расписание"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "Вставить встречу в расписание"
@@ -10521,37 +12129,38 @@ msgid "Cancel the current mail operation"
 msgstr "Сохранить текущий файл"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Создать"
-
-#: ui/evolution-mail-global.xml.h:4
 msgid "Compose _New Message"
 msgstr "Создать новое сообщение"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr "Создать или исправить почтовый счёт и другие настройки"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Создать или исправить правила фильтрации новой почты"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "Создать или исправить определения виртуальной папки"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Очистить корзину"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Забыть пароли"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Следующее сообщение"
+
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "Открыть окно для создания почтового сообщения"
@@ -10609,97 +12218,102 @@ msgstr "Подписывание на папку \"%s\""
 msgid "Change the properties of this folder"
 msgstr "Изменить свойства этой папки"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Скопировать выбранные сообщения"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Вырезать"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Вырезать выбранные сообщения"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Скрыть выбранные сообщения"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Скрыть удаленные сообщения"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Скрыть прочитанные сообщения"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Пометить все как прочитанное"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Пометить все видимые сообщения как уже прочитанные"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Вставить сообщение в буфер обмена"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Переместить выбранные сообщения в другую папку"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Выбрать все"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Выбрать подшивку"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Выбрать все видимые сообщения"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "Показать скрытые сообщения"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Показать сообщения, которые были временно скрыты"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Временно скрыть все сообщения, которые уже были прочитаны"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Временно скрыть выбранные сообщения"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Список подшитых сообщений"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:25
 msgid "_Expunge"
 msgstr "Вычеркнуть"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "Папка"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Обратить выделение"
 
@@ -10931,7 +12545,8 @@ 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"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Просмотр печатаемых сообщений"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10950,38 +12565,34 @@ msgstr "Предыдущее сообщение"
 msgid "Previous Unread Message"
 msgstr "Предыдущее непрочитанное сообщение"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "Печать сообщения..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "Просмотр печати..."
-
-#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Печать этого сообщения"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Ответить"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Ответить всем"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "Поиск сообщения"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "Сохранить сообщение в текстовом файле"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr "Поиск в тексте отображаемого сообщения"
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Настройки страницы для вашего текущего принтера"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -11035,32 +12646,28 @@ msgstr "Скопировать в папку"
 msgid "_Create Filter From Message"
 msgstr "Создать фильтр из сообщения"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr "Переслать сообщение"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Сообщения"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "Переместить в папку"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Отобразить"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "Открыть сообщение"
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "_Re-send Message"
-msgstr "Перепослать сообщение"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Закрыть это окно"
@@ -11068,12 +12675,12 @@ msgstr "Закрыть это окно"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "Закрыть"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "Просмотр"
 
@@ -11265,7 +12872,7 @@ msgstr "Поле \"Ответ\""
 msgid "_Security"
 msgstr "Безопасность"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "Справка"
 
@@ -11298,15 +12905,28 @@ msgid "Unsubscribe"
 msgstr "Отказаться"
 
 #: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Assign Task"
+msgstr "Связанное"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Отменить задание"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Удалить задание"
+msgid "Cancel this task"
+msgstr "Отменить задание"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "Обновить список"
@@ -11315,39 +12935,28 @@ msgstr "Обновить список"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "Скопировать выбранное задание"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Создать новое задание"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "Вырезать выбранное задание"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "Удалить выбранные задания"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr "Новое задание"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 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:13
-msgid "Tasks Settings"
+#, fuzzy
+msgid "Tasks Settings..."
 msgstr "Установки заданий"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "Задание"
 
@@ -11404,132 +13013,128 @@ msgid "Exit the program"
 msgstr "Выйти из программы"
 
 #: ui/evolution.xml.h:16
-msgid "Getting _Started"
-msgstr "Краткое руководство"
-
-#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr "Импортировать во внешний формат файла"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "Переместить эту папку в другое место"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "Открыть в новом окне"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Открыть эту папку в новом окне"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Показать информацию о программе Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Отправить сообщение об ошибке"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "Отправить сообщение об ошибке"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Отправить сообщение об ошибке используя Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "Переключить"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Переключить отображение строки папок"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Переключить отображение строки закладок"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "Переключить работу в/вне сети."
 
-#: ui/evolution.xml.h:31
-msgid "Using the C_ontact Manager"
-msgstr "Использование диспетчера контактов"
-
-#: ui/evolution.xml.h:32
-msgid "Using the _Calendar"
-msgstr "Использование календаря"
-
-#: ui/evolution.xml.h:33
-msgid "Using the _Mailer"
-msgstr "Использование почты"
-
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Просмотр выбранной папки"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "О программе..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "Скопировать..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "Строка папки"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "Перейти к папке..."
 
-#: ui/evolution.xml.h:46
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "Импортировать файл..."
 
-#: ui/evolution.xml.h:47
-msgid "_Index"
-msgstr "Индекс"
-
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "Переместить..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "Новый"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "Новая папка"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "Переименовать..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "Закладка"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Строка закладок"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "Работать вне сети"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "Изменить свойства этой папки"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr "Итог почты"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Прочитанное"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
 msgstr "Установки почты..."
 
 #: views/addressbook/galview.xml.h:1
@@ -11564,6 +13169,25 @@ msgstr "Сообщения"
 msgid "With Category"
 msgstr "C категорией:"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Выбрать часовой пояс"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Выделение:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Часовые пояса"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11643,7 +13267,7 @@ msgstr "Все сопровождение"
 msgid "_Current View"
 msgstr "Текущий просмотр"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "Определить окна просмотра"
 
@@ -11658,15 +13282,15 @@ msgstr "ПВСЧПСВ"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Сейчас"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Сегодня"
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Время должно быть в формате: %s"
@@ -11748,11 +13372,11 @@ msgstr "Кодировка символов"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 msgid "Search Editor"
 msgstr "Редактор поиска"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Сохранить результаты поиска"
 
@@ -11773,10 +13397,6 @@ msgstr "Показать все"
 msgid "Information"
 msgstr "Информация"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Предупреждение"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Ошибка"
@@ -11794,11 +13414,11 @@ msgstr "Сообщение"
 msgid "Don't show this message again."
 msgstr "Не показывать это сообщение снова."
 
-#: widgets/misc/e-search-bar.c:176
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Поиск"
 
-#: widgets/misc/e-search-bar.c:268
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Найти"
 
@@ -11821,3 +13441,169 @@ msgstr "init_corba(): Не удалось инициализировать GNOME"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Итог:"
+
+#~ msgid "label18"
+#~ msgstr "метка26"
+
+#~ msgid "label19"
+#~ msgstr "метка26"
+
+#~ msgid "label20"
+#~ msgstr "метка26"
+
+#~ msgid "Category contains"
+#~ msgstr "Категория содержит"
+
+#~ msgid "USA"
+#~ msgstr "США"
+
+#~ msgid "Send contact to other"
+#~ msgstr "Послать контакт другому"
+
+#~ msgid "Canceled"
+#~ msgstr "Отменено"
+
+#~ msgid "label26"
+#~ msgstr "метка26"
+
+#~ msgid "All"
+#~ msgstr "Все"
+
+#~ msgid "Unfiled"
+#~ msgstr "Незаполненное"
+
+#~ msgid "label55"
+#~ msgstr "метка26"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Настройки календаря"
+
+#~ msgid "label21"
+#~ msgstr "метка26"
+
+#~ msgid "This is an event that can be added to your calendar."
+#~ msgstr "Это событие можно занести в ваш календарь."
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Это сообщение в настоящий момент не доступно"
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Видимо папка невостановимо испорчена."
+
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Edit"
+#~ msgstr "Правка"
+
+#~ msgid "Resend"
+#~ msgstr "Перепослать"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Диспетчер счетов Evolution"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "%s, %s написал:"
+
+#~ msgid "Updating message list"
+#~ msgstr "Обновление списка сообщений"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Установка Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %e %B %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Сбой печати сообщения"
+
+#~ msgid "label27"
+#~ msgstr "метка26"
+
+#~ msgid "label39"
+#~ msgstr "метка26"
+
+#~ msgid "label40"
+#~ msgstr "метка26"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Новый контакт"
+
+#~ msgid "Send _contact to other"
+#~ msgstr "Послать контакт другому"
+
+#~ msgid "Send _message to contact"
+#~ msgstr "Послать сообщение к контакту"
+
+#~ msgid "Go to present time"
+#~ msgstr "Перейти к настоящему времени"
+
+#~ msgid "W_ork Week"
+#~ msgstr "Рабочая неделя"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Закрыть эту встречу"
+
+#~ msgid "Print S_etup"
+#~ msgstr "Настройка печати"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Сохранить встречу и закрыть окно диалога"
+
+#~ msgid "Help"
+#~ msgstr "Справка"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Послать контакт другому..."
+
+#~ msgid "See online help"
+#~ msgstr "Просмотр онлайновой справки"
+
+#~ msgid "Print Preview..."
+#~ msgstr "Просмотр печати..."
+
+#~ msgid "_Re-send Message"
+#~ msgstr "Перепослать сообщение"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Удалить задание"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Сохранить задание как что-нибудь еще"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Краткое руководство"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Использование диспетчера контактов"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Использование календаря"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Использование почты"
+
+#~ msgid "_Index"
+#~ msgstr "Индекс"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Установки почты..."
diff --git a/po/sk.po b/po/sk.po
index 84c14e447a..896c9081e3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,10 +1,11 @@
 # evolution Slovak translation.
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001.
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.12.99\n"
-"POT-Creation-Date: 2001-08-19 16:47+0200\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2001-08-19 17:28CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -320,7 +321,7 @@ msgstr "VKartapre %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/conduit/address-conduit.c:1100
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
@@ -336,20 +337,20 @@ msgstr "Kurzor nie je moе╬nц╘ naд█ц╜taе╔\n"
 msgid "EBook not loaded\n"
 msgstr "EBook nenaд█ц╜tanц╫\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Nie je moе╬nц╘ preд█ц╜taе╔ blok aplikц║cie Adresa z pilota"
 
@@ -397,20 +398,34 @@ msgstr "Vytvц║racie rozhranie pre komponent adresц║ra Evolution."
 msgid "Factory for the sample Addressbook control"
 msgstr "Vytvц║racie rozhranie pre ukц║е╬kovц╫ ovlц║dacц╜ prvok Adresц║r"
 
-#: addressbook/gui/component/addressbook-component.c:385
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Chyba pri naд█ц╜tavanц╜ informц║cie o filtroch:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-component.c:386
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Novц╫ kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:385
+#: addressbook/gui/component/addressbook-component.c:386
 msgid "New _Contact"
 msgstr "Novц╫ _kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:387
 msgid "New Contact List"
 msgstr "Novц╫ zoznam kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:387
 msgid "New Contact _List"
 msgstr "Novц╫ _zoznam kontaktov"
 
@@ -519,12 +534,12 @@ msgstr "Meno ц╨д█_tu:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:89 my-evolution/my-evolution.glade.h:18
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_Pridaе╔"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:94
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
@@ -548,28 +563,28 @@ msgstr "_Meno serveru:"
 msgid "Other Contacts"
 msgstr "Inц╘ kontakty"
 
-#: addressbook/gui/component/addressbook.c:375
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Prosц╜m, zadajte vaе║u e-mailovц╨ adresu a heslo pre %s"
 
-#: addressbook/gui/component/addressbook.c:383
+#: addressbook/gui/component/addressbook.c:394
 msgid "LDAP Authentication"
 msgstr "Overenie LDAP"
 
-#: addressbook/gui/component/addressbook.c:394
+#: addressbook/gui/component/addressbook.c:405
 msgid "Email Address:"
 msgstr "E-mailovц║ adresa:"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:418
 msgid "Password:"
 msgstr "Heslo:"
 
-#: addressbook/gui/component/addressbook.c:470
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Nie je moе╬nц╘ otvoriе╔ adresц║r"
 
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -578,7 +593,7 @@ msgstr ""
 "Nebolo moе╬nц╘ otvoriе╔ tento adresц║r. To buд▐ znamenц║, е╬e ste\n"
 "zadali neplatnц╘ URI, alebo LDAP server nefunguje."
 
-#: addressbook/gui/component/addressbook.c:482
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -589,7 +604,7 @@ msgstr ""
 "Ak chcete LDAP v Evolution pouе╬ц╜vaе╔, musц╜te ho prekompilovaе╔\n"
 "z CVS po zц╜skanц╜ OpenLDAP z tohto odkazu.\n"
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -597,37 +612,37 @@ 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:631
+#: addressbook/gui/component/addressbook.c:642
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "д╫ubovoд╬nц╘ pole obsahuje"
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Meno obsahuje"
 
-#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "E-mail obsahuje"
 
-#: addressbook/gui/component/addressbook.c:634
+#: addressbook/gui/component/addressbook.c:645
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "KategцЁria je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:635 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Pokroд█ilц╘..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:827
+#: addressbook/gui/component/addressbook.c:874
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "д╫ubovoд╬nц║ kategцЁria"
 
-#: addressbook/gui/component/addressbook.c:865
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ktorц╘ zobrazц╜ prehliadaд█ prieд█inku"
 
@@ -642,19 +657,19 @@ 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:1597
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "Primц║rny e-mail"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "E-mail 3"
 
@@ -676,19 +691,19 @@ msgstr "Pridaе╔ adresu do existujц╨ceho kontaktu \"%s\""
 msgid "Querying Addressbook..."
 msgstr "Otц║zka pre adresц║r..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Upraviе╔ kontakt"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Pridaе╔ do kontaktov"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "Zliaе╔ e-mailovц╨ adresu"
 
@@ -709,7 +724,7 @@ 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:661
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
 #: shell/e-shortcuts-view.c:385
@@ -728,11 +743,11 @@ msgstr "Poslaе╔ poе║tu HTML?"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez mena"
 
-#: addressbook/gui/component/select-names/e-select-names.c:430
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr "Nepodarilo sa zц╜skaе╔ lokц║lny sklad. To by sa nikdy nemalo staе╔."
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names.c:560
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adresц║ra"
 
@@ -848,9 +863,9 @@ msgstr "_Kontakty..."
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1319 mail/mail-config.glade.h:93
-#: ui/evolution-mail-message.xml.h:88 ui/evolution-tasks.xml.h:12
-#: ui/evolution.xml.h:35
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Odstrц║niе╔"
 
@@ -910,94 +925,99 @@ msgstr "Odstrц║niе╔ kontakt?"
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrц╜ do tц╫chto kategцЁriц╜:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1555
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1556
-#: addressbook/gui/contact-editor/e-contact-editor.c:1623
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Prц║ca"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Prц║ca 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1558
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Pracovnц╫ fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1559
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Spц╓tnц╘ volanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1560
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
-#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Domov"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Domov 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Domц║ci fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-#: addressbook/gui/contact-editor/e-contact-editor.c:1625
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Inц╘"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "д▌alе║ц╜ fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Primц║rny"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Rц║dio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Nie je moе╬nц╘ odstrц║niе╔ sц╨bor sц╨hrnu prieд█inku `%s': %s"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Rц╫chly kontakt"
@@ -1007,7 +1027,7 @@ msgid "Edit Full"
 msgstr "Upraviе╔ celц╘"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Celц╘ meno"
 
@@ -2247,9 +2267,9 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Uloе╬iе╔ ako vKartu"
@@ -2260,18 +2280,18 @@ msgid "Open"
 msgstr "Otvoriе╔"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Predaе╔ д▐alej kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Send Message to Contact"
 msgstr "Poslaе╔ sprц║vu kontaktu"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
@@ -2279,16 +2299,16 @@ msgid "Print"
 msgstr "Tlaд█iе╔"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "Tlaд█iе╔ obц║lku"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/libfilter-i18n.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
 #: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Odstrц║niе╔"
 
@@ -2303,8 +2323,8 @@ msgid "Success"
 msgstr "ц spech"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1649
-#: shell/e-storage.c:503
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Neznц║ma chyba"
 
@@ -2312,7 +2332,7 @@ msgstr "Neznц║ma chyba"
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Prц╜stup zamietnutц╫"
 
@@ -2331,8 +2351,8 @@ msgstr "Protokol nepodporovanц╫"
 #: addressbook/gui/widgets/e-addressbook-util.c:41
 #: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
 msgid "Cancelled"
 msgstr "Zruе║enц╫"
 
@@ -2357,131 +2377,131 @@ msgid "Error removing list"
 msgstr "Chyba pri odstraе┬ovanц╜ zoznamu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1159
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr "Chyba pri odstraе┬ovanц╜ karty"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* kliknutц╜m pridц║te kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Uloе╬iе╔ ako"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Primц║rny telefцЁn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Asistentov telefцЁn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "TelefцЁn do zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "Spц╓tnц╘ volanie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Firemnц╫ felefцЁn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "TelefцЁn domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organizц║cia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Adresa zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Adresa domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "TelefцЁn v aute"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "TelefцЁn do zamestnania 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "TelefцЁn domov 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Inц╫ telefцЁn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Inц║ adresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "WWW strц║nka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Oddelenie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Pracovisko"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Titul"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Povolanie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Vedц╨ci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Prezц╫vka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:811
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Manе╬el(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:812
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Poznц║mka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "Voд╬no/zaneprц║zdnenц╫ URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1156
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "Hotovo."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1188
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr "Odstraе┬ujem karty..."
 
@@ -2881,8 +2901,9 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:601
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:604
+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."
@@ -2967,12 +2988,12 @@ msgid "Completed"
 msgstr "Dokonд█enц╫"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -3014,9 +3035,9 @@ msgstr "Nedefinovanц║"
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1416
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1452
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
 #: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
@@ -3075,6 +3096,27 @@ msgstr "Komentц║r obsahuje"
 msgid "Unmatched"
 msgstr "Nenц║jdenц╘"
 
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Kalendц║r"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "ц lohy"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "VPrieд█inok na konferenciu"
+
 #: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Vytvoriе╔ novц╨ schц╢dzku"
@@ -3083,7 +3125,8 @@ msgstr "Vytvoriе╔ novц╨ schц╢dzku"
 msgid "New _Appointment"
 msgstr "Novц║ _schц╢dzka"
 
-#: calendar/gui/component-factory.c:408 ui/evolution-tasks.xml.h:4
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Vytvorц╜ novц╨ ц╨lohu"
 
@@ -3095,23 +3138,23 @@ msgstr "Novц║ ц╨_loha"
 msgid "The URI that the calendar will display"
 msgstr "URI, ktorц╘ bude kalendц║r zobrazovaе╔"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr "Zvukovц╘ alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr "Alarmy sprц║vami"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr "Poе║tovц╘ alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr "Programovц╘ alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr "Neznц║me alarmy"
 
@@ -3296,7 +3339,7 @@ msgstr "koniec schц╢dzky"
 msgid "hour(s)"
 msgstr "hodц╜n"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:114
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minц╨t"
 
@@ -3354,22 +3397,23 @@ msgid "Friday"
 msgstr "Piatok"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Hide completed tasks after"
-msgstr "Skryе╔ dokonд█enц╘ ц╨lohy po"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Hours"
 msgstr "Hodiny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minц╨ty"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Pondelok"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "ц lohy _po termц╜ne:"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
@@ -3440,7 +3484,7 @@ msgid "Wednesday"
 msgstr "Streda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Pracovnц╫ tц╫е╬deе┬"
 
@@ -3477,17 +3521,18 @@ msgid "_General"
 msgstr "_Vе║eobecnц╘"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Skryе╔ dokonд█enц╘ ц╨lohy po"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
 msgstr "_Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Other"
 msgstr "_Inц╘"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Overdue tasks:"
-msgstr "ц lohy _po termц╜ne:"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
 msgstr "_So"
@@ -3584,41 +3629,35 @@ msgstr " (Termц╜n do "
 msgid "Due "
 msgstr "Termц╜n do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
-#: shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Upraviе╔ schц╢dzku"
 
-#: calendar/gui/dialogs/comp-editor.c:464
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schц╢dzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:467
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "ц loha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Poloе╬ka dennц╜ka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:484
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "е╫iadny sц╨hrn"
 
-#: calendar/gui/dialogs/comp-editor.c:854 mail/mail-callbacks.c:1486
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
 #: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Prepц╜saе╔ sц╨bor?"
 
-#: calendar/gui/dialogs/comp-editor.c:858 mail/mail-callbacks.c:1492
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
 #: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
@@ -3627,12 +3666,12 @@ msgstr ""
 "Sц╨bor s tц╫mto menom uе╬ existuje\n"
 "Prepц╜saе╔ ho?"
 
-#: calendar/gui/dialogs/comp-editor.c:921 ui/evolution-comp-editor.xml.h:15
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Uloе╬iе╔ ako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr "Nepodarilo sa zц╜skaе╔ aktuц║lnu verziu!"
 
@@ -3921,7 +3960,7 @@ 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:84
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4154,7 +4193,7 @@ msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1284
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "_Otvoriе╔"
 
@@ -4166,14 +4205,16 @@ msgstr "Vystri_hnц╨е╔"
 
 #: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
 #: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:11
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopц╜rovaе╔"
 
 #: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
 #: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
 #: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:36 ui/evolution-tasks.xml.h:13
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Vloе╬iе╔"
 
@@ -4234,8 +4275,11 @@ msgstr "Priorita"
 msgid "Start Date"
 msgstr "Dц║tum е║tartu"
 
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-storage-set-view.c:1464
-#: shell/e-summary-storage.c:78
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Sц╨hrn"
 
@@ -4283,7 +4327,7 @@ msgid "New All Day _Event"
 msgstr "Novц║ celodennц║ _udalosе╔"
 
 #: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Prejsе╔ na d_neе║nц╫ dц║tum"
 
@@ -4481,7 +4525,8 @@ msgid "Item sent!\n"
 msgstr "Poloе╬ka poslanц║!\n"
 
 #: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
-msgid "The item could not be send!\n"
+#, fuzzy
+msgid "The item could not be sent!\n"
 msgstr "Poloе╬ku nie je moе╬nц╘ poslaе╔!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
@@ -4535,12 +4580,12 @@ msgstr "MetцЁdy potrebnц║ pre naд█ц╜tanie `%s' nie je podporovanц║"
 msgid "New _Appointment..."
 msgstr "Novц║ _schц╢dzka..."
 
-#: calendar/gui/gnome-cal.c:1258
+#: calendar/gui/gnome-cal.c:1260
 #, 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:1269
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "MetцЁda nutnц║ k otvoreniu `%s' nie je podporovanц║"
@@ -4601,7 +4646,7 @@ msgstr "OktцЁber"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr "Organizц║tor musц╜ byе╔ nastavenц╫."
 
@@ -4757,12 +4802,6 @@ msgstr "Pi"
 msgid "Sa"
 msgstr "So"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-local-storage.c:180
-#: shell/e-shortcuts.c:1025 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "ц lohy"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -4796,9 +4835,8 @@ msgid "Print Calendar"
 msgstr "Tlaд█iе╔ kalendц║r"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1895 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-comp-editor.xml.h:10
-#: ui/evolution-mail-message.xml.h:64
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Ukц║е╬ka pred tlaд█ou"
 
@@ -4947,7 +4985,12 @@ msgstr ""
 "has-categories? oд█akц║va ako vе║etky argumenty reе╔azce alebo presne jeden "
 "argument boolean nepravu (#f)"
 
-#: calendar/pcs/query.c:967
+#: calendar/pcs/query.c:805
+#, fuzzy
+msgid "is-completed? expects 0 arguments"
+msgstr "time-now neoд█akц║va е╬iadne argumenty"
+
+#: calendar/pcs/query.c:1008
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Vyhodnotenie vц╫razu pre hд╬adanie neskonд█ilo pravdivostnou hodnotou"
 
@@ -5357,7 +5400,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"
@@ -5399,7 +5443,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."
@@ -5407,7 +5452,7 @@ msgstr "Neznц║my stav overenia."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "Heslo"
 
@@ -5436,37 +5481,37 @@ msgstr "Prihlц║senie POP pred SMTP nie pomocou zdroja POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Preklad regulц║rneho vц╫razu zlyhal: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vyе╬aduje komponentu pouе╬ц╜vateд╬skц╘ho mena"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vyе╬aduje komponentu hostiteд╬a"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vyе╬aduje komponentu cesty"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "Zisе╔ujem adresu: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Zlyhalo hд╬adanie mena: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Zlyhalo hд╬adanie hostiteд╬a: %s: hostiteд╬ nenц║jdenц╫"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Zlyhalo hд╬adanie hostiteд╬a: %s: neznц║my dц╢vod"
@@ -5667,7 +5712,7 @@ msgstr "Kontrolujem novц╨ poе║tu"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolujem novц╨ poе║tu vo vе║etkц╫ch prieд█inkoch"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:717
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Prieд█inky"
 
@@ -5685,7 +5730,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"
@@ -5697,7 +5743,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
@@ -5731,12 +5778,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:837 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Prieд█inok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1037
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodiд█ovskц╫ prieд█inok nesmie obsahovaе╔ podprieд█inky"
 
@@ -6012,8 +6059,9 @@ msgstr "Nie je moе╬nц╘ vytvoriе╔ sц╨hrn prieд█inku: %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:1549
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Synchronizujem prieд█inok"
 
 #: camel/providers/local/camel-mbox-summary.c:507
@@ -6225,35 +6273,35 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Nie je moе╬nц╘ otvoriе╔ alebo vytvoriе╔ sц╨bor .newsrc pre %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:193
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Zц╜skavam POP sц╨hrn"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nie je moе╬nц╘ skontrolovaе╔ novц╨ poе║tu na POP serveri: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:239
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nie je moе╬nц╘ otvoriе╔ prieд█inok: zoznam sprц║v nebol ц╨plnц╫."
 
-#: camel/providers/pop3/camel-pop3-folder.c:332
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nie je moе╬nц╘ zц╜skaе╔ sprц║vu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:348
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nie je moе╬nц╘ zц╜skaе╔ sprц║vu zo POP serveru %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "е╫iadna sprц║va s uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:375
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Zц╜skavam POP sprц║vu %d"
@@ -6271,7 +6319,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:52
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -6303,7 +6351,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
@@ -6363,7 +6412,7 @@ msgid "No such folder `%s'."
 msgstr "Prieд█inok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6415,7 +6464,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:64
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -6469,7 +6518,8 @@ msgstr "Pouе╬ц╜vateд╬ nie je lokц║lny, bude predanц║ podд╬a <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:193
 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:195
 msgid "Requested action not taken: mailbox unavailable"
@@ -6814,21 +6864,21 @@ msgstr "Uloе╬iе╔ ako..."
 msgid "Warning!"
 msgstr "Varovanie!"
 
-#: composer/e-msg-composer.c:876
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "Sц╨bor existuje, prepц╜saе╔ ho?"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladanц╜ sц╨boru: %s"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri naд█ц╜tavanц╜ sц╨boru: %s"
 
-#: composer/e-msg-composer.c:989
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -6836,16 +6886,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:1039
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri prц╜stupe k sц╨boru: %s"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je moе╬nц╘ zц╜skaе╔ sprц║vu z editora"
 
-#: composer/e-msg-composer.c:1053
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -6854,7 +6904,7 @@ msgstr ""
 "Nepodarilo sa hд╬adaе╔ v sц╨bore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1059
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -6863,7 +6913,7 @@ msgstr ""
 "Nepodarilo sa skrц║tiе╔ sц╨bor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1068
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -6872,15 +6922,16 @@ msgstr ""
 "Chyba pri automatickom ukladanц╜ sprц║v: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1168
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 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:1316
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -6890,24 +6941,24 @@ msgstr ""
 "\n"
 "Chcete uloе╬iе╔ zmeny?"
 
-#: composer/e-msg-composer.c:1323 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1346
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Otvoriе╔ sц╨bor"
 
-#: composer/e-msg-composer.c:1495
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "Vloе╬iе╔ sц╨bor"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2312
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Napц╜saе╔ sprц║vu"
 
-#: composer/e-msg-composer.c:2402
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Nie je moе╬nц╘ vytvoriе╔ okno editora sprц║v."
 
@@ -6969,53 +7020,59 @@ msgstr "Predmet neobsahuje"
 
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
 #: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1339
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
 #: widgets/misc/e-dateedit.c:1566
 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:1336
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
 #: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr "%d.%m.%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr "%x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -7023,13 +7080,13 @@ 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
+#: e-util/e-time-utils.c:313
 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
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -7169,7 +7226,7 @@ msgstr ""
 "Prosц╜m, vrц║е╔te sa a zadajte platnц╫ prieд█inok, kam doruд█iе╔ poе║tu."
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:808
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Vybraе╔ prieд█inok"
 
@@ -7181,7 +7238,7 @@ msgstr "Zadajte URI prieд█inku"
 msgid "<click here to select a folder>"
 msgstr "<kliknutц╜m vyberiete prieд█inok>"
 
-#: filter/filter-input.c:197
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -7364,7 +7421,7 @@ msgstr "Odpovedanц║"
 msgid "Score"
 msgstr "SkцЁre"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1071
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Odosielateд╬"
 
@@ -7486,13 +7543,13 @@ msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Jaj. Musц╜te zadaе╔ aspoе┬ jeden prieд█inok ako zdrojovц╫."
 
 #: 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/intelligent.c:194
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Import"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Poе║ta"
 
@@ -7520,11 +7577,11 @@ msgstr ""
 "Evolution naе║iel sц╨bory GnomeCard.\n"
 "Chcete ich naimportovaе╔ do Evolution?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7580,166 +7637,171 @@ msgstr "Vytvц║racie rozhranie pre komponent Sц╨hrnu poе║ty Evolution."
 msgid "Mail configuration interface"
 msgstr "Rozhranie pre nastavenie poе║ty"
 
-#: mail/component-factory.c:112
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "VPrieд█inok na konferenciu"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr "Tento prieд█inok nemц╢е╬e obsahovaе╔ sprц║vy."
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr "Zmenц╜ vlastnosti tohto prieд█inku"
 
-#: mail/component-factory.c:739
+#: mail/component-factory.c:757
 msgid "New Mail Message"
 msgstr "Novц║ sprц║va"
 
-#: mail/component-factory.c:739
+#: mail/component-factory.c:757
 msgid "New _Mail Message"
 msgstr "Novц║ _sprц║va"
 
-#: mail/component-factory.c:771
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je moе╬nц╘ inicializovaе╔ poе║tovц╫ komponent Evolution."
 
-#: mail/component-factory.c:908
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "Nie je moе╬nц╘ zaregistrovaе╔ sklad u shellu"
 
-#: mail/folder-browser-ui.c:257
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Vlastnosti \"%s\""
 
-#: mail/folder-browser-ui.c:259
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:233 mail/mail-display.c:281
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie je moе╬nц╘ vytvoriе╔ doд█asnц╫ prieд█inok: %s"
 
-#: mail/folder-browser.c:906
+#: mail/folder-browser.c:909
 msgid "Create vFolder from Search"
 msgstr "Vytvoriе╔ vPrieд█inok z vц╫sledku hд╬adania"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "Vprieд█inok na _predmet"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "Vprieд█inok na _odosielateд╬a"
 
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "Vprieд█inok na _adresц║tov"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "VPrieд█inok na _konferenciu"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateд╬ovi"
 
-#: mail/folder-browser.c:1272
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresц║toch"
 
-#: mail/folder-browser.c:1275
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "_Upraviе╔ ako novц╨ sprц║vu..."
 
-#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Uloе╬iе╔ _ako..."
 
-#: mail/folder-browser.c:1290
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_Tlaд█iе╔"
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Odpovedaе╔ odosielateд╬ovi"
 
-#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Odpovedaе╔ _zoznamu"
 
-#: mail/folder-browser.c:1299 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Odpovedaе╔ _vе║etkц╫m"
 
-#: mail/folder-browser.c:1301
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "Poslaе╔ д▐_alej"
 
-#: mail/folder-browser.c:1304 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Oznaд█iе╔ ako _preд█ц╜tanц╨"
 
-#: mail/folder-browser.c:1306 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Oznaд█iе╔ ako _nepreд█ц╜tanц╨"
 
-#: mail/folder-browser.c:1308
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr "Oznaд█iе╔ ako _dц╢leе╬itц╨"
 
-#: mail/folder-browser.c:1310
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr "Oznaд█iе╔ ako nedц╢_leе╬itц╨"
 
-#: mail/folder-browser.c:1315
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "Pre_sunц╨е╔ do prieд█inka..."
 
-#: mail/folder-browser.c:1317
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Kopц╜rovaе╔ do prieд█inku..."
 
-#: mail/folder-browser.c:1321 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "Obnoviе╔ _zmazanц╘"
 
-#: mail/folder-browser.c:1326
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "Pridaе╔ odosielateд╬a do adresц║ra"
 
-#: mail/folder-browser.c:1331
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Pouе╬iе╔ filtre"
 
-#: mail/folder-browser.c:1335
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "Vytvoriе╔ pra_vidlo zo sprц║vy"
 
-#: mail/folder-browser.c:1493
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filter na konferenciu"
 
-#: mail/folder-browser.c:1494
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "VPrieд█inok na konferenciu"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VPrieд█inok na konferenciu (%s)"
@@ -7808,15 +7870,15 @@ msgid "Evolution News Editor"
 msgstr "Editor diskusnц╫ch skupц╜n Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Editor ц╨д█tov Evolution"
 
-#: mail/mail-account-gui.c:998
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "Uloе╬iе╔ podpis"
 
-#: mail/mail-account-gui.c:1004
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -7826,6 +7888,10 @@ msgstr ""
 "\n"
 "Chcete uloе╬iе╔ zmeny?"
 
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
 #: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (е║tandard)"
@@ -7850,12 +7916,12 @@ msgstr "Neodstraе┬ovaе╔"
 msgid "Really delete account?"
 msgstr "Naozaj odstrц║niе╔ ц╨д█et?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "Naozaj chcete odstrц║niе╔ tento ц╨д█et diskusnц╫ch skupц╜n?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:41
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Nastavenie poе║ty"
 
@@ -7883,7 +7949,7 @@ msgstr "%s konferencia"
 msgid "Add Filter Rule"
 msgstr "Pridaе╔ pravidlo filtra"
 
-#: 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"
@@ -7895,7 +7961,7 @@ msgstr ""
 "posielaе╔, prijц╜maе╔ alebo pц╜saе╔ poе║tu.\n"
 "Chcete ho nastaviе╔ teraz?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -7903,7 +7969,7 @@ msgstr ""
 "Predtц╫m, ako zaд█nete pц╜saе╔ sprц║vu,\n"
 "musц╜te nastaviе╔ identitu."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -7911,11 +7977,11 @@ msgstr ""
 "Predtц╫m, ako zaд█nete pц╜saе╔ sprц║vu,\n"
 "musц╜te nastaviе╔ spц╢sob prenosu.."
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Nemц║te nastavenц╫ spц╢sob prenosu poе║ty"
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -7923,7 +7989,7 @@ msgstr ""
 "Tц║to sprц║va nemц║ predmet.\n"
 "Naozaj ju chcete poslaе╔?"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -7934,37 +8000,36 @@ msgstr ""
 "Je moе╬nц╘, е╬e ich poе║tovц╫ server zverejnц╜ pridanц╜m hlaviд█ky Apparently-To.\n"
 "Poslaе╔ aj tak?"
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr "Musц╜te zadaе╔ adresц║tov pre poslanie tejto sprц║vy."
 
-#: mail/mail-callbacks.c:389
+#: mail/mail-callbacks.c:390
 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:633
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "V %s, %s zapц╜sanц╘:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:894
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Predanц║ sprц║va:\n"
 
-#: mail/mail-callbacks.c:991
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Presunц╨е╔ sprц║vu do"
 
-#: mail/mail-callbacks.c:993
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Kopц╜rovaе╔ sprц║vu do"
 
-#: mail/mail-callbacks.c:1362
+#: mail/mail-callbacks.c:1366
 #, 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:1384
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -7972,7 +8037,7 @@ msgstr ""
 "Upravovaе╔ mц╢е╬ete iba sprц║vy uloе╬enц╘\n"
 "v prieд█inku Koncepty."
 
-#: mail/mail-callbacks.c:1418
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -7980,44 +8045,44 @@ msgstr ""
 "Iba sprц║vy z prieд█inku Odoslanц╘ je moе╬nц╘\n"
 "znovu poslaе╔."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1434
 #, 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:1451
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "е╫iadna vybranц║ sprц║va"
 
-#: mail/mail-callbacks.c:1536
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Uloе╬iе╔ sprц║vu ako..."
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Uloе╬iе╔ sprц║vy ako..."
 
-#: mail/mail-callbacks.c:1683 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varovanie"
 
-#: mail/mail-callbacks.c:1688
+#: mail/mail-callbacks.c:1714
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Tц║to operц║cia natrvalo odstrц║ni vе║etky sprц║vy oznaд█enц╘ ako zmazanц╘. "
-"Ak budete pokraд█ovaе╔, nebude uе╬ moе╬nц╘ tieto sprц║vy obnoviе╔.\n"
+"Tц║to operц║cia natrvalo odstrц║ni vе║etky sprц║vy oznaд█enц╘ ako zmazanц╘. Ak "
+"budete pokraд█ovaе╔, nebude uе╬ moе╬nц╘ tieto sprц║vy obnoviе╔.\n"
 "\n"
 "Naozaj odstrц║niе╔ tieto sprц║vy?"
 
-#: mail/mail-callbacks.c:1695
+#: mail/mail-callbacks.c:1721
 msgid "Do not ask me again."
 msgstr "Tц╨to sprц║vu uе╬ nezobrazovaе╔."
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8026,59 +8091,69 @@ msgstr ""
 "Chyba pri naд█ц╜tavanц╜ informц║cie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1810
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:1856
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Tlaд█iе╔ sprц║vu"
 
-#: mail/mail-callbacks.c:1902
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Tlaд█ sprц║vy zlyhala"
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:2012
 #, 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?"
 
 #: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "Prosц╜m, zadajte vaе║e meno a e-mailovц╨ adresu. \"Nepovinnц╘\" informц║cie "
 "nemusц╜te zadaе╔, iba ak chcete, aby boli posielanц╘ vo vaе║ich sprц║vach."
 
 #: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Prosц╜m, zadajte informц║cie o vaе║om serveri pre prijц╜manц╨ poе║tu. Ak neviete, "
 "ktorц╫ typ serveru pouе╬iе╔, kontaktujte vц║е║ho administrц║tora alebo "
 "poskytovateд╬a pripojenia na Internet."
 
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
 #: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Prosц╜m, zadajte informц║cie o protokole pre odosielanie poе║ty. Ak neviete, "
 "ktorц╫ typ protokolu pouе╬iе╔, kontaktujte vц║е║ho administrц║tora alebo "
 "poskytovateд╬a pripojenia na Internet."
 
 #: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "Uе╬ ste skoro na konci nastavenia poе║ty. Vaе║e meno, server pre prц╜jem poе║ty a "
 "spц╢sob odosielania budц╨ pouе╬itц╘ pre vytvorenie poе║tovц╘ho ц╨д█tu Evolution. "
@@ -8086,7 +8161,7 @@ msgstr ""
 "zobrazenie."
 
 #. set window title
-#: mail/mail-config-druid.c:622
+#: mail/mail-config-druid.c:558
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca ц╨д█tom Evolution"
 
@@ -8095,16 +8170,16 @@ msgstr "Sprievodca ц╨д█tom Evolution"
 #. * name. I don't think this will work with maildir. How can we figure out
 #. * what shortcut to insert?
 #.
-#: mail/mail-config.c:1577
+#: mail/mail-config.c:1579
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Doruд█enц║ poе║ta"
 
-#: mail/mail-config.c:1807
+#: mail/mail-config.c:1809
 msgid "Checking Service"
 msgstr "Kontrolujem sluе╬bu"
 
-#: mail/mail-config.c:1878 mail/mail-config.c:1881
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Pripц║jam sa na server..."
 
@@ -8216,197 +8291,202 @@ msgstr "Prieд█inok konceptov:"
 msgid "E_nable"
 msgstr "_Povoliе╔"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Uloе╬ц╜ aktuц║lny sц╨bor pod inц╫m menom"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Upraviе╔..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Povolenц╘"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Zц╜skaе╔ digitц║lne ID..."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "Sц╨bor s HTML podpisom:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "v HTML poе║te"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "v texte"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Nastavenie poе║ty"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Umiestnenie poе║tovej schrц║nky"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Pouе╬iе╔ ho ako е║_tandardnц╫ ц╨д█et"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr "е═tandardne zobrazovaе╔ _nц║hд╬ad sprц║vy"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr "е═tandardne zobrazovaе╔ sprц║vy ako _vlц║kna"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "NNTP server:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Diskusnц╘ skupiny"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Nepovinnц╘ informц║cie"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "ID PGP kд╬ц╨д█a:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Pц╫taе╔ sa pri posielanц╜ sprц║v be_z predmetu"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 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:58
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "Citovaе╔"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Prц╜jem poе║ty"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Prijц╜mam poе║tu"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Moе╬nosti prц╜jmu"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Povinnц╘ informц║cie"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "Bezpeд█nц╘ MIME"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Bezpeд█nosе╔"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Vyberte sц╨bor pre ukladanie zц║znamu filtrovania..."
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Posielanie poе║ty"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Posielanie poе║ty"
 
-#: mail/mail-config.glade.h:72 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Odoslanц╘"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Odoslanц╘ a koncepty"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Prieд█inok pre odoslanц╘ sprц║vy:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
 msgstr "Server vyе╬aduje _prihlц║senie"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Sц╨bor s podpisom:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Zdroj"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Informц║cia o zdrojovom kцЁde"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Zdroje"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "е═peciц║lne prieд█inky"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "е═tandardnц╫ Unixovц╫ sц╨bor mbox"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr "Pouе╬iе╔ bezpeд█nц╘ pripojenie (_SSL)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8416,103 +8496,103 @@ msgstr ""
 "\n"
 "Kliknutц╜m \"Nasledujц╨ci\" zaд█neme."
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "_Vе╬dy naд█ц╜tavaе╔ obrц║zky zo siete"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
 msgstr "_Automaticky kontrolovaе╔ poе║tu kaе╬dц╫ch"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
 msgstr "Kontrolovaе╔ _podporovanц╘ typy"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
 msgstr "_E-mailovц║ adresa:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
 msgstr "Vyprц║zdniе╔ prieд█inky na O_dpadky pri ukonд█enц╜"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Full Name:"
 msgstr "_Celц╘ meno:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "_HTML podpis:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr "_Zvц╫razniе╔ citц║cie pomocou"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
 msgstr "_Hostiteд╬:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
 msgstr "_Naд█ц╜taе╔ obrц║zky ak je odosielateд╬ v adresц║ri"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr "Uloе╬iе╔ _zц║znam o filtrovanц╜ do:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
 msgstr "_Oznaд█iе╔ sprц║vy ako \"Preд█ц╜tanц╘\" po"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr "_Nikdy nenaд█ц╜taе╔ obrц║zky zo siete"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Organization:"
 msgstr "_Organizц║cia:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr "Cesta k spustiteд╬nц╘mu _sц╨boru PGP:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr "Pamц╓taе╔ si heslo _PGP pri ukonд█enц╜"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Uloе╬iе╔ toto heslo"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "Posielaе╔ е║tandardne ako _HTML."
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "Sц╨bor s po_dpisom:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "Meno po_uе╬ц╜vateд╬a:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr "miesto"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "sekц╨nd."
 
@@ -8718,17 +8798,22 @@ msgstr "Odkaz na neznц║me externц╘ dц║ta (typ \"%s\")"
 msgid "Malformed external-body part."
 msgstr "Nesprц║vna д█asе╔ externц╘ho tela."
 
-#: mail/mail-local.c:466
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Prieд█inok %s neexistuje"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Otvц║ram '%s'"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Menц╜ prieд█inok \"%s\" na formц║t \"%s\""
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -8737,7 +8822,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:914
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -8745,11 +8830,11 @@ msgstr ""
 "Ak nemц╢е╬ete otvoriе╔ tц╨to poе║tovц╨ schrц║nku, potom\n"
 "ju budete musieе╔ opraviе╔ ruд█ne."
 
-#: mail/mail-local.c:1007
+#: mail/mail-local.c:1002
 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:1018
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Znovu nastaviе╔ %s"
@@ -8804,7 +8889,7 @@ msgstr "Posielam sprц║vu %d z %d"
 msgid "Failed on message %d of %d"
 msgstr "Zlyhanie na sprц║ve %d z %d"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Dokonд█enц╘."
 
@@ -8844,7 +8929,7 @@ msgstr "Odpadky"
 msgid "Forwarded messages"
 msgstr "Sprц║vy predanц╘ д▐alej"
 
-#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvц║ram prieд█inok %s"
@@ -8854,35 +8939,45 @@ msgstr "Otvц║ram prieд█inok %s"
 msgid "Opening store %s"
 msgstr "Otvц║ram sklad %s"
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Otvц║ram prieд█inok %s"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraе┬ujem prieд█inok %s"
 
-#: mail/mail-ops.c:1599
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synchronizujem prieд█inok"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Aktualizujem prieд█inok"
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "д▄istц╜m prieд█inok"
 
-#: mail/mail-ops.c:1684
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Zц╜skavam sprц║vu %s"
 
-#: mail/mail-ops.c:1751
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Zц╜skavam %d sprц║v"
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ukladц║m %d sprц║v"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -8891,7 +8986,7 @@ msgstr ""
 "Nepodarilo sa vytvoriе╔ vц╫stupnц╫ sц╨bor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -8900,11 +8995,11 @@ msgstr ""
 "Chyba pri ukladanц╜ sprц║v do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Ukladц║m prц╜lohu"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -8913,12 +9008,12 @@ msgstr ""
 "Nepodarilo sa vytvoriе╔ vц╫stupnц╫ sц╨bor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je moе╬nц╘ zapц╜saе╔ dц║ta: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
@@ -8975,7 +9070,7 @@ msgstr "Obnovujem..."
 msgid "Waiting..."
 msgstr "д▄akц║m..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Zruе║enц╘."
 
@@ -9001,11 +9096,11 @@ msgstr "Predanц║ sprц║va"
 msgid "Forwarded Message"
 msgstr "Predanц║ sprц║va"
 
-#: mail/mail-vfolder.c:282
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "VPrieд█inky"
 
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Novц╫ vPrieд█inok"
 
@@ -9074,7 +9169,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2314
+#: mail/message-list.c:2312
 msgid "Generating message list"
 msgstr "Generujem zoznam sprц║v"
 
@@ -9090,36 +9185,36 @@ msgstr "Prijatц╘"
 msgid "Size"
 msgstr "Veд╬kosе╔"
 
-#: mail/subscribe-dialog.c:167
+#: mail/subscribe-dialog.c:174
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Prechц║dzam prieд█inky pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:169
+#: mail/subscribe-dialog.c:176
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Prechц║dzam koreе┬ovц╘ prieд█inky na \"%s\""
 
-#: mail/subscribe-dialog.c:268
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prihlasujem si prieд█inok \"%s\""
 
-#: mail/subscribe-dialog.c:270
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasujem sa z prieд█inku \"%s\""
 
-#: mail/subscribe-dialog.c:1241 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Prieд█inok"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1490
 msgid "No server has been selected"
 msgstr "Nebol vybranц╫ е╬iadny server"
 
-#: mail/subscribe-dialog.c:1540
+#: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
 msgstr "Prosц╜m, vyberte server."
 
@@ -9163,6 +9258,10 @@ msgstr "Komponent Evolution pre Sц╨hrn."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Vytvц║racie rozhranie pre komponent Sц╨hrn Evolution."
 
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
 #: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Nie je moе╬nц╘ inicializovaе╔ komponent Sц╨hrn Evolution."
@@ -9183,7 +9282,7 @@ msgstr "%l:%M%p"
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "Sц╨hrn poе║ty"
 
@@ -9192,7 +9291,7 @@ msgstr "Sц╨hrn poе║ty"
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
 #: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:591
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS:ZSAM:EGAA"
 msgstr "LZIB:LZTT:LKPR"
 
@@ -9228,6 +9327,11 @@ msgstr "Nastala chyba poд█as naд█ц╜tavania kanц║la sprц║v."
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b> Chyba naд█ц╜tavania RDF</b>"
 
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "_Kanц║ly sprц║v"
+
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr "е╫iadne ц╨lohy"
@@ -9236,11 +9340,16 @@ msgstr "е╫iadne ц╨lohy"
 msgid "My Weather"
 msgstr "Moje poд█asie"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Server poд█asia nemohol byе╔ kontaktovanц╫</b></dd>"
 
-#: my-evolution/e-summary-weather.c:652
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "_Poд█asie"
+
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Oblasti"
 
@@ -9261,10 +9370,12 @@ msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent sц╨hrnu nemohol inicializovaе╔ Bonobo.\n"
 
 #: my-evolution/metar.c:29
+#, fuzzy
 msgid "F"
 msgstr "F"
 
 #: my-evolution/metar.c:29
+#, fuzzy
 msgid "C"
 msgstr "C"
 
@@ -10462,11 +10573,6 @@ msgstr "Vе║etky _prieд█inky:"
 msgid "All news _feeds:"
 msgstr "Vе║etky _kanц║ly sprц║v:"
 
-#: my-evolution/my-evolution.glade.h:6 shell/e-local-storage.c:174
-#: shell/e-shortcuts.c:1024
-msgid "Calendar"
-msgstr "Kalendц║r"
-
 #: my-evolution/my-evolution.glade.h:7
 msgid "How many days should the calendar display at once?"
 msgstr "Koд╬ko dnц╜ mц║ naraz kalendц║r zobraziе╔?"
@@ -10575,9 +10681,7 @@ msgstr "Zobraziе╔ detaily"
 msgid "Cancel Operation"
 msgstr "Zruе║iе╔ operц║ciu"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1023
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
 msgid "Inbox"
 msgstr "Doruд█enц║ poе║ta"
 
@@ -10585,7 +10689,7 @@ msgstr "Doruд█enц║ poе║ta"
 msgid "Outbox"
 msgstr "Poе║ta na odoslanie"
 
-#: shell/e-local-storage.c:592
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Lokц║lne prieд█inky"
 
@@ -10603,7 +10707,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"
@@ -10683,25 +10788,25 @@ msgstr "Nie je moе╬nц╘ skopц╜rovaе╔ prieд█inok sц║m do seba."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Nie je moе╬nц╘ presunц╨е╔ prieд█inok do jednoho zo svojц╜ch podprieд█inkov."
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Zadajte prieд█inok, kam chcete skopц╜rovaе╔ prieд█inok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Kopц╜rovaе╔ prieд█inok"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Zadajte prieд█inok, kam presunц╨е╔ preд█inok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Presunц╨е╔ prieд█inok"
 
-#: shell/e-shell-folder-commands.c:357
+#: shell/e-shell-folder-commands.c:358
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -10710,30 +10815,30 @@ msgstr ""
 "Nie je moе╬nц╘ odstrц║niе╔ prieд█inok:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Odstrц║niе╔ prieд█inok '%s'"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Naozaj chcete odstrц║niе╔ prieд█inok `%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:458
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Premenovaе╔ prieд█inok '%s'"
 
-#: shell/e-shell-folder-commands.c:462 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Premenovaе╔"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:470
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Meno prieд█inku:"
@@ -10767,7 +10872,7 @@ msgstr ""
 msgid "New..."
 msgstr "Novц║..."
 
-#: shell/e-shell-folder-title-bar.c:569 shell/e-shell-folder-title-bar.c:570
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Bez mena)"
 
@@ -10807,7 +10912,7 @@ msgstr ""
 "Importujem %s\n"
 "Importujem poloе╬ku %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -10865,11 +10970,11 @@ msgstr "Vyberte sц╨bor"
 msgid "File type:"
 msgstr "Typ sц╨boru:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Vybraе╔ prieд█inok"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr "Vyberte cieд╬ovц╫ prieд█inok pre import tц╫chro dц║t"
 
@@ -10877,7 +10982,19 @@ msgstr "Vyberte cieд╬ovц╫ prieд█inok pre import tц╫chro dц║t"
 msgid "Closing connections..."
 msgstr "Zatvц║ram spojenia..."
 
-#: shell/e-shell-startup-wizard.c:536
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Nie je moе╬nц╘ inicializovaе╔ shell Evolution: %s"
+
+#: shell/e-shell-startup-wizard.c:558
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -10885,7 +11002,7 @@ msgstr ""
 "Prosц╜m, д█akajte...\n"
 "Hд╬adц║m existujц╨ce nastavenie"
 
-#: shell/e-shell-startup-wizard.c:539
+#: shell/e-shell-startup-wizard.c:561
 msgid "Starting Intelligent Importers"
 msgstr "Spц╨е║е╔am inteligentnц╘ importy"
 
@@ -10940,38 +11057,38 @@ msgstr "Pracovaе╔ off-line"
 msgid "(No folder displayed)"
 msgstr "(Nezobrazenц╫ е╬iadny prieд█inok)"
 
-#: shell/e-shell-view.c:1457
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1497
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution je momentц║lne on-line. Stlaд█enц╜m tohto tlaд█idla prejdete do mцЁdu "
 "off-line."
 
-#: shell/e-shell-view.c:1504
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution prechц║dza do mцЁdu off-line."
 
-#: shell/e-shell-view.c:1510
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution je momentц║lne off-line. Stlaд█enц╜m tohto tlaд█idla prejdete do mцЁdu "
 "on-line."
 
-#: shell/e-shell.c:508
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvoriе╔ lokц║lny sklad -- %s"
 
-#: shell/e-shell.c:1435
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -10980,23 +11097,23 @@ msgstr ""
 "Aj! Pohд╬ad pre `%s' neoд█akц║vane spadol. :-(\n"
 "To asi znamenц║, е╬e komponent %s spadol."
 
-#: shell/e-shell.c:1639 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1641
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr "Neplatnц╘ argumenty"
 
-#: shell/e-shell.c:1643
+#: shell/e-shell.c:1646
 msgid "Cannot register on OAF"
 msgstr "Nie je moе╬nц╘ zaregistrovaе╔ u OAF"
 
-#: shell/e-shell.c:1645
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr "Konfiguraд█nц║ databц║za nenц║jdenц║"
 
-#: shell/e-shell.c:1647 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "Vе║eobecnц║ chyba"
 
@@ -11105,11 +11222,11 @@ msgstr "Premenuje tц╨to skratku"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrц║niе╔ tц╨to skratku z panelu skratiek"
 
-#: shell/e-shortcuts.c:620
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Chyba pri ukladanц╜ skratiek."
 
-#: shell/e-shortcuts.c:1019
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr "Skratky"
 
@@ -11117,46 +11234,51 @@ msgstr "Skratky"
 msgid "(No name)"
 msgstr "(Bez mena)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "е╫iadna chyba"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Prieд█inok s tц╫mto menom uе╬ existuje"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Uvedenц╫ typ prieд█inku nie je platnц╫"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Chyba V/V"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Nedostatok miesta pre vytvorenie prieд█inku"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Uvedenц╫ prieд█inok nebol nц║jdenц╫"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Funkcia nie je v tomto sklade implementovanц║"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Operц║cia nepodporovanц║"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Uvedenц╫ typ nie je podporovanц╫ tц╫mto skladom"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:511
 msgid "The specified folder cannot be modified or removed"
 msgstr "Uvedenц╫ prieд█inok nie je moе╬nц╘ zmeniе╔ alebo odstrц║niе╔"
 
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Nie je moе╬nц╘ presunц╨е╔ prieд█inok do jednoho zo svojц╜ch podprieд█inkov."
+
 #: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
@@ -11295,8 +11417,8 @@ msgstr "Poslaе╔ ladiaci vц╫stup zo vе║etkц╫ch komponent od sц╨boru."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je moе╬nц╘ inicializovaе╔ komponentovц╫ systц╘m Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopц╜rovaе╔"
 
@@ -11312,11 +11434,11 @@ msgstr "Vytvoriе╔ novц╫ kontakt"
 msgid "Create new contact list"
 msgstr "Vytvoriе╔ novц╫ zoznam kontaktov"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Vystrihnц╨е╔"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:9
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Vystrihne vц╫ber"
 
@@ -11328,11 +11450,11 @@ msgstr "Odstrц║niе╔ vybranц╘ kontakty"
 msgid "New List"
 msgstr "Novц╫ zoznam"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Vloе╬iе╔"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:21
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Vloе╬ц╜ obsah schrц║nky"
 
@@ -11380,10 +11502,10 @@ msgstr "Zastaviе╔"
 msgid "Stop Loading"
 msgstr "Zastaviе╔ naд█ц╜tavanie"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
@@ -11405,7 +11527,7 @@ msgstr "Zoznam _kontaktov"
 msgid "_Forward Contact..."
 msgstr "_Poslaе╔ kontakt д▐alej..."
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:37
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
@@ -11423,9 +11545,9 @@ msgstr "_Hд╬adaе╔ kontakty"
 msgid "_Select All"
 msgstr "Vybraе╔ _vе║etko"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:40
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
 #: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:15
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Nц║stroje"
@@ -11435,7 +11557,8 @@ msgid "Configure the calendar's settings"
 msgstr "Nastavenie kalendц║ra"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All-Day _Event"
+#, fuzzy
+msgid "Create a New All Day _Event"
 msgstr "Vytvoriе╔ novц╨ celodennц╨ _udalosе╔"
 
 #: ui/evolution-calendar.xml.h:5
@@ -11446,99 +11569,105 @@ msgstr "Vytvoriе╔ novц╨ ц╨_lohu"
 msgid "Create a _New Appointment"
 msgstr "Vytvoriе╔ _novц╨ schц╢dzku"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "Vytvorц╜ udalosе╔ poд█as celц╘ho dе┬a"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Deе┬"
 
-#: ui/evolution-calendar.xml.h:11 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "O_dstrц║niе╔ tц╨to schц╢dzku"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Prejsе╔ na"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back"
 msgstr "Prejsе╔ dozadu"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward"
 msgstr "Prejsе╔ dopredu"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Prejsе╔ na _dц║tum"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Prejsе╔ na zadanц╫ dц║tum"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to today"
 msgstr "Prejsе╔ na dneе║nц╫ dц║tum"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "Mesiac"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Novц║ schц╢dzka"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-tasks.xml.h:8
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 msgid "New Task"
 msgstr "Novц║ ц╨loha"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Ukц║е╬ka kalendц║ra pred tlaд█ou"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
 msgstr "U_kц║е╬ka pred tlaд█ou"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this calendar"
 msgstr "Vytlaд█ц╜ tento kalendц║r"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 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:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Zobraziе╔ jeden deе┬"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Zobraziе╔ jeden mesiac"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Zobraziе╔ jeden tц╫е╬deе┬"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show work week"
+#: ui/evolution-calendar.xml.h:31
+#, fuzzy
+msgid "Show the working week"
 msgstr "Zobraziе╔ pracovnц╫ tц╫е╬deе┬"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Tц╫е╬deе┬"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "_Schц╢dzka..."
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "Nastavenie _kalendц║ra..."
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:41
 msgid "_Publish Free/Busy Information"
 msgstr "_Publikovaе╔ informц║cie o voд╬nom д█ase"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:42
 msgid "_Task..."
 msgstr "ц _loha..."
 
@@ -11567,42 +11696,34 @@ 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:11
-msgid "Print S_etup"
-msgstr "Nastavenie t_laд█e"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Tlaд█iе╔ tц╨to poloе╬ku"
 
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tlaд█iе╔..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
 msgid "Save"
 msgstr "Uloе╬iе╔"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Uloе╬iе╔ a zavrieе╔"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Uloе╬iе╔ zoznam a zatvoriе╔ dialцЁg"
 
-#: ui/evolution-comp-editor.xml.h:18
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Uloе╬iе╔ tц╨to poloе╬ku na disk"
 
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-mail-message.xml.h:73
-msgid "Setup the page settings for your current printer"
-msgstr "Nastavц╜ strц║nku pre aktuц║lnu tlaд█iareе┬"
-
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
@@ -11784,95 +11905,101 @@ msgstr "_Prihlц║siе╔ prieд█inky..."
 msgid "Change the properties of this folder"
 msgstr "Zmenц╜ vlastnosti tohto prieд█inku"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Kopц╜rovaе╔ vybranц╘ sprц║vy"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Vystrihnц╨е╔"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Vystrihnц╨е╔ vybranц╘ sprц║vy"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Skryе╔ _vybranц╘ sprц║vy"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Skryе╔ _odstrц║nenц╘ sprц║vy"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 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"
+#: ui/evolution-mail-list.xml.h:8
+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
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Oznaд█iе╔ _vе║etky ako preд█ц╜tanц╘"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Oznaд█ц╜ vе║etky viditeд╬nц╘ sprц║vy ako uе╬ preд█ц╜tanц╘"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Vloе╬ц╜ sprц║vu zo schrц║nky"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trvalo odstrц║niе╔ vе║etky zmazanц╘ sprц║vy z tohto prieд█inku"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vybraе╔ _vе║etko"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Vybraе╔ _vlц║kno"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Vyberie vе║etky sprц║vy, ktorц╘ momentц║lne nie sц╨ vybranц╘"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Vyberie vе║etky sprц║vy v rovnakom vlц║kne ako je vybranц║ sprц║va"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Vybraе╔ vе║etky viditeд╬nц╘ sprц║vy"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "Zobraziе╔ sk_rytц╘ sprц║vy"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Zobraziе╔ sprц║vy, ktorц╘ boli doд█asne skrytц╘"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Doд█asne skryе╔ vе║etky sprц║vy, ktorц╘ uе╬ boli preд█ц╜tanц╘"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Doд█asne skryе╔ vybranц╘ sprц║vy"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Zoznam vlц║kien"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:25
 msgid "_Expunge"
 msgstr "_Vyд█istiе╔"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:38
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Prieд█inok"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obrц║tiе╔ vц╫ber"
 
@@ -12136,6 +12263,10 @@ msgstr "Uloе╬iе╔ sprц║vu do textovц╘ho sц╨boru"
 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:73
+msgid "Setup the page settings for your current printer"
+msgstr "Nastavц╜ strц║nku pre aktuц║lnu tlaд█iareе┬"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Zobraziе╔ zdrojovц╫ _kцЁd sprц║vy"
@@ -12471,27 +12602,28 @@ msgstr "O_bnoviе╔ ц╨lohu"
 msgid "Configure the task view's settings"
 msgstr "Nastavenie pohд╬adu pre ц╨lohy"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "Kopц╜ruje vybranц╨ ц╨lohu"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "Vystihne vybranц╨ ц╨lohu"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "Odstrц║niе╔ vybranц╘ ц╨lohy"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Vloе╬ц╜ ц╨lohu zo schrц║nky"
 
-#: ui/evolution-tasks.xml.h:10
-msgid "Tasks Settings"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings..."
 msgstr "Nastavenie ц╨lohy"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "ц _loha"
 
@@ -12577,7 +12709,8 @@ msgstr "_Poslaе╔ sprц║vu o chybe"
 
 #: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Poе║le sprц║vu o chybe pomocou nц║stroja pre oznamovanie chц╫b Priateд╬ v nц╨dzi."
+msgstr ""
+"Poе║le sprц║vu o chybe pomocou nц║stroja pre oznamovanie chц╫b Priateд╬ v nц╨dzi."
 
 #: ui/evolution.xml.h:26
 msgid "Toggle"
@@ -12974,3 +13107,12 @@ 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"
 
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Sц╨hrn"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "V %s, %s zapц╜sanц╘:"
+
+#~ msgid "Print S_etup"
+#~ msgstr "Nastavenie t_laд█e"
diff --git a/po/sl.po b/po/sl.po
index a9480e84a9..b9d29479bf 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Andraz Tori <andraz.tori1@guest.arnes.si> 2000
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-08-18 19:48+0200\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -320,7 +321,7 @@ msgstr "eVizitka za %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/conduit/address-conduit.c:1100
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
@@ -336,20 +337,20 @@ msgstr "Kazalec se ni mogel naloе╬iti\n"
 msgid "EBook not loaded\n"
 msgstr "EKnjiga ni naloе╬ena\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
@@ -397,6 +398,41 @@ msgstr "Tovarna za Evolucijino komponento adresarja."
 msgid "Factory for the sample Addressbook control"
 msgstr "Tovarna za vzorд█no kontrolo adresarja"
 
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
+msgstr "Stik"
+
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Napaka ob nalaganju podatkov o filtrih:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Nov stik:"
+
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Nov stik:"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Seznam _stikov"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Seznam _stikov"
+
 #: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
 msgstr "Uredi adresar"
@@ -467,8 +503,8 @@ msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
 msgstr ""
-"Te podatke potrebuje vaе║ streе╬nik ldap za doloд█itev katera vozliе║д█a naj se "
-"uporabljajo za iskanja. Za veд█ podatkov se obrnite na svojega "
+"Te podatke potrebuje vaе║ streе╬nik ldap za doloд█itev katera vozliе║д█a naj "
+"se uporabljajo za iskanja. Za veд█ podatkov se obrnite na svojega "
 "administratorja."
 
 #: addressbook/gui/component/addressbook-config.glade.h:17
@@ -502,16 +538,17 @@ msgstr "Ime _raд█una:"
 #: addressbook/gui/component/addressbook-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:89
-#: my-evolution/my-evolution.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_Dodaj"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: mail/mail-config.glade.h:94 ui/evolution-mail-messagedisplay.xml.h:6
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Uredi"
 
@@ -531,28 +568,28 @@ msgstr "Ime _streе╬nika:"
 msgid "Other Contacts"
 msgstr "Drugo stiki"
 
-#: addressbook/gui/component/addressbook.c:372
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Prosim vpiе║ite naslov svoje e-poе║te in geslo za %s"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:394
 msgid "LDAP Authentication"
 msgstr "Avtentifikacija LDAP"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:405
 msgid "Email Address:"
 msgstr "E-poе║tni naslov:"
 
-#: addressbook/gui/component/addressbook.c:404
+#: addressbook/gui/component/addressbook.c:418
 msgid "Password:"
 msgstr "Geslo:"
 
-#: addressbook/gui/component/addressbook.c:467
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:474
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -561,7 +598,7 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da streе╬nik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c:479
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -573,7 +610,7 @@ msgstr ""
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -581,37 +618,37 @@ msgstr ""
 "Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
 "pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/component/addressbook.c:628
+#: addressbook/gui/component/addressbook.c:642
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/component/addressbook.c:629
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Ime vsebuje"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "E-naslov vsebuje"
 
-#: addressbook/gui/component/addressbook.c:631
+#: addressbook/gui/component/addressbook.c:645
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:632 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Napredno..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:821
+#: addressbook/gui/component/addressbook.c:874
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
-#: addressbook/gui/component/addressbook.c:859
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaе╬e brskalnik map"
 
@@ -626,19 +663,19 @@ msgstr "(brez)"
 
 #: 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:1585
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "prvi e-naslov"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1586
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "E-naslov 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "E-naslov 3"
 
@@ -660,19 +697,19 @@ msgstr "Dodaj naslov k obstojeд█emu stiku \"%s\""
 msgid "Querying Addressbook..."
 msgstr "Poizvedujem v adresarju..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Uredi podatke stika"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Dodaj k stikom"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "Zlij E-poе║tne naslove"
 
@@ -693,10 +730,10 @@ 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:640
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Odstrani"
 
@@ -712,11 +749,11 @@ msgstr "Poе║lji poе║to v obliki HTML?"
 msgid "Unnamed Contact"
 msgstr "Neimenovan stik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr "Ne morem dobiti krajevne shrambe. To se nikoli ne bi smelo zgoditi."
 
-#: addressbook/gui/component/select-names/e-select-names.c:484
+#: addressbook/gui/component/select-names/e-select-names.c:560
 msgid "Select Contacts from Addressbook"
 msgstr "Izberi stike iz adresarja"
 
@@ -831,9 +868,10 @@ msgstr "_Stiki..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1476 mail/folder-browser.c:1319
-#: mail/mail-config.glade.h:93 ui/evolution-mail-message.xml.h:88
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Zbriе║i"
 
@@ -889,98 +927,103 @@ msgstr "Naslov _spletne strani:"
 msgid "Delete Contact?"
 msgstr "Zbriе║i stik?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledeд█im kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1543
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Pomoд█nik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1544
-#: addressbook/gui/contact-editor/e-contact-editor.c:1611
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Sluе╬ba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1545
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Sluе╬ba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1546
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Sluе╬beni faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1547
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Povratni klic"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1548
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Avto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1549
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Podjetje"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1550
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Doma 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1552
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Domaд█i faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1553
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1554
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1555
-#: addressbook/gui/contact-editor/e-contact-editor.c:1613
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1556
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1558
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Prvi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1559
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radijo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1560
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
@@ -990,7 +1033,7 @@ msgid "Edit Full"
 msgstr "Uredi celoto"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Polno ime"
 
@@ -1012,42 +1055,1043 @@ msgid "Address _2:"
 msgstr "Naslov _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Pomoд█nik"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Samodejno"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Usmerjenost"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "avgust"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "let"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Velikost"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Poе║iljam"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#, fuzzy
+msgid "Bouvet Island"
+msgstr "Zmeren pesek"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Toд█a"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Stol"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Preveri naslov"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Datoteka"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Kitajski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Barve"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Kopiram"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "Drе╬a_va:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#, fuzzy
+msgid "Fiji"
+msgstr "Konд█aj"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "ZDA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Prekliд█i"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+#, fuzzy
+msgid "Germany"
+msgstr "maj"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "Grе║ki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "dop"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Sploе║no"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Toд█a"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "Ur"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "nedeljo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+#, fuzzy
+msgid "Iceland"
+msgstr "Znova naloе╬i"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+#, fuzzy
+msgid "India"
+msgstr "Individualno"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#, fuzzy
+msgid "Ireland"
+msgstr "Znova naloе╬i"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+#, fuzzy
+msgid "Italy"
+msgstr "Dnevne"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+#, fuzzy
+msgid "Japan"
+msgstr "Japonski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#, fuzzy
+msgid "Jordan"
+msgstr "Korejski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "najniе╬ja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "najniе╬ja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "_imperijski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#, fuzzy
+msgid "Lithuania"
+msgstr "Rahla toд█a"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "marec"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Poе║ta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Poе║ta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Poе║ta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#, fuzzy
+msgid "Marshall Islands"
+msgstr "Pesek s presledki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#, fuzzy
+msgid "Martinique"
+msgstr "Minuta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Robovi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "maj"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "ponedeljek"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Prenosni telefon"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Upravljalec"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Nova poе║ta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Naslednja nit"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Nov stik:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nova poе║ta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "visoka"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "_imperijski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "Minuta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Sedaj"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Prilepi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#, fuzzy
+msgid "Pitcairn"
+msgstr "Natisni vizitko"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Pokonд█no"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "po"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Obmoд█ja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Dim"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Sploе║no"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "_Naд█rtuj"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "obiд█ajna"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Pesek"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "nedeljo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Vzdevek"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Videno"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Deе╬"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Goste meglice"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finska"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Za"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Tornado"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "torek"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Turе║ki"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ukrajinski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Neimenovano sporoд█ilo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Izberi imena"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#, fuzzy
+msgid "Western Sahara"
+msgstr "Zahodnoevropski"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Videno"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Naslov:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Poе║tni predal:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Drе╬ava/Provinca:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_Poе║tna е║tevilka:"
 
@@ -1136,7 +2180,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skrij naslove ob poе║iljanju poе║te na ta seznam"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -1314,10 +2358,10 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:1286
-#: ui/evolution-addressbook.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Shrani kot eVizitko"
 
@@ -1327,37 +2371,37 @@ msgid "Open"
 msgstr "Odpri"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send contact to other"
-msgstr "Poе║lji stik drugim"
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Posreduj _pripeto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:674
-#: ui/evolution-addressbook.xml.h:26
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "Stiku poе║lji sporoд█ilo"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:675
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Natisni"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:283
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Zbriе║i"
 
@@ -1372,8 +2416,8 @@ msgid "Success"
 msgstr "Uspeh"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1638
-#: shell/e-storage.c:503
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -1381,7 +2425,7 @@ msgstr "Neznana napaka"
 msgid "Repository offline"
 msgstr "Skladiе║д█e, ki ni na mreе╬i"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
@@ -1400,8 +2444,8 @@ msgstr "Protokol ni podprt"
 #: addressbook/gui/widgets/e-addressbook-util.c:41
 #: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
 msgid "Cancelled"
 msgstr "preklicano"
 
@@ -1426,131 +2470,131 @@ msgid "Error removing list"
 msgstr "Napaka ob odstranjevanju seznama"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1159
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr "Napaka ob odstranjevanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Zavedi kot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "E-poе║ta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Pomoе╬ni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Sluе╬bebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Domaд█ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Sluе╬beni naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Domaд█i naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Sluе╬beni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Domaд█ telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Drug naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Oddelek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Poklic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:811
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Partner(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:812
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1156
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "Opravljeno."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1188
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr "Odstranjujem vizitke..."
 
@@ -1916,42 +2960,42 @@ 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:405
+#: calendar/gui/calendar-commands.c:414
 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/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
 #: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:435
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:442
 #: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
 #: my-evolution/e-summary-calendar.c:240
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:581
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -2038,12 +3082,12 @@ msgid "Completed"
 msgstr "konд█ano"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -2084,14 +3128,13 @@ msgid "Undefined"
 msgstr "ni definirana"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1416
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1386
-#: 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
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
 msgid "None"
 msgstr "brez"
 
@@ -2147,27 +3190,66 @@ msgstr "Komentar vsebuje"
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Koledar"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Naloge"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "vMapa glede na dopisni seznam"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Ustvari nov sestanek"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr "Nov _sestanek"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Ustvari nov posel"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Nova naloga"
+
 #: 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-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr "Moе╬nosti zvoд█nega alarma"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr "moе╬nosti alrama sporoд█il"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr "Moе╬nosti alarma poе║te"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr "Moе╬nosti alarma programa"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr "Neznane moе╬nosti alarma"
 
@@ -2215,72 +3297,72 @@ msgstr "ur"
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 dan"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d tednov"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 teden"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d ur"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 ura"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Kaе╬i sporoд█ilo"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Poе║lji e-poе║to"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Poе╬eni program"
 
-#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
 #: calendar/gui/dialogs/meeting-page.c:601
 #: calendar/gui/dialogs/meeting-page.c:636
 #: calendar/gui/dialogs/meeting-page.c:701
@@ -2291,19 +3373,19 @@ msgstr "Poе╬eni program"
 msgid "Unknown"
 msgstr "neznano"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:409
 msgid "before start of appointment"
 msgstr "pred priд█etkom sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 msgid "after start of appointment"
 msgstr "po priд█etku sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 msgid "before end of appointment"
 msgstr "pred koncem sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 msgid "after end of appointment"
 msgstr "po koncu sestanka"
 
@@ -2352,7 +3434,7 @@ msgstr "konec sestanka"
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:114
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minut"
 
@@ -2423,136 +3505,143 @@ msgid "Monday"
 msgstr "ponedeljek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Naloge s p_rekoraд█enim rokom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Show appointment _end times in week and month views"
 msgstr "Kaе╬i д█ase _koncev sestankov v tedenskih in meseд█nih pogledih"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Kaе╬i е║tevilke tednov v navigatorju po dnevih"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Sta_rt of day:"
 msgstr "Zaд█e_tek dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Su_n"
 msgstr "_ned"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "nedeljo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "д█_et"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "T_ue"
 msgstr "_tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Tas_ks due today:"
 msgstr "Nalo_ge z danaе║njim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "д█etrtek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr "д▄as"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time _zone:"
 msgstr "д▄asovni _pas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Time di_visions:"
 msgstr "д▄asovne _delitve:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr "Oblika izpisa д█asa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "torek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "sreda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Delavni teden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "_12 hour (am/pm)"
-msgstr "_12 urna (dop./pop.)"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 urna (dop./pop.)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
 msgstr "_24 urna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Vpraе║aj za potrditev ob brisanju predmetov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Compress weekends in month view"
 msgstr "_Skrд█i vikende v meseд█nem pogledu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Prikaz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_End of day:"
 msgstr "_Konec dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
 msgstr "_pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_General"
 msgstr "_Sploе║no"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Skrij zbrisana sporoд█ila"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
 msgstr "po_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Other"
 msgstr "_Drugo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "_Overdue tasks:"
-msgstr "Naloge s p_rekoraд█enim rokom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
 msgstr "so_b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Task List"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Wed"
 msgstr "_sre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "before the start of the appointment"
 msgstr "pred priд█etkom sestanka"
 
@@ -2636,41 +3725,35 @@ msgstr " (Rok "
 msgid "Due "
 msgstr "Rok"
 
-#: calendar/gui/dialogs/comp-editor-util.c:273
-#: calendar/gui/dialogs/comp-editor-util.c:329 shell/e-local-storage.c:174
-#: shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Stik"
-
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:465
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:479
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:849 mail/mail-callbacks.c:1485
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
 #: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Prepiе║i datoteko?"
 
-#: calendar/gui/dialogs/comp-editor.c:853 mail/mail-callbacks.c:1491
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
 #: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
@@ -2679,12 +3762,12 @@ msgstr ""
 "Datoteka z enakim imenom е╬e obstaja.\n"
 "Naj jo prepiе║em?"
 
-#: calendar/gui/dialogs/comp-editor.c:916 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1069
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr "Ne morem dobiti trenutne razliд█ice!"
 
@@ -2742,28 +3825,6 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr "Izberi д█asovni pas"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "Izbira"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "д▄asovni pasovi"
-
-#: 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 ""
-"Uporabite lev miе║kin gumb za poveд█avo obmoд█ja zemljevida in izbiro д█asovnega "
-"pasu.\n"
-" Uporabite desni miе║kin gumb za pomanjе║avo."
-
 #: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Sestanek"
@@ -2995,7 +4056,7 @@ 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:84
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Vrsta"
@@ -3042,7 +4103,7 @@ msgstr "na"
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr "pojavitve"
 
@@ -3137,7 +4198,7 @@ msgid "Progress"
 msgstr "Napredek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
@@ -3227,47 +4288,49 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1284
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "_Odpri"
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
 #: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Izreе╬i"
 
-#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3432
-#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
 #: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
 #: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:16
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: calendar/gui/e-calendar-table.c:862
+#: calendar/gui/e-calendar-table.c:863
 msgid "_Mark as Complete"
 msgstr "_Oznaд█i kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:864
+#: calendar/gui/e-calendar-table.c:865
 msgid "_Delete this Task"
 msgstr "_Zbriе║i to opravilo"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr "_Oznaд█i opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:869
+#: calendar/gui/e-calendar-table.c:870
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriе║i izbrana opravila"
 
-#: calendar/gui/e-calendar-table.c:1129
+#: calendar/gui/e-calendar-table.c:1130
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
 
@@ -3308,8 +4371,11 @@ msgstr "Prioriteta"
 msgid "Start Date"
 msgstr "Datum priд█etka"
 
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-storage-set-view.c:1465
-#: shell/e-summary-storage.c:78
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Povzetek"
 
@@ -3352,16 +4418,12 @@ msgstr "dop"
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-day-view.c:3400
-msgid "New _Appointment"
-msgstr "Nov _sestanek"
-
 #: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
 #: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
@@ -3559,7 +4621,8 @@ msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
 #: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
-msgid "The item could not be send!\n"
+#, fuzzy
+msgid "The item could not be sent!\n"
 msgstr "Predmeta ni mogoд█e poslati!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
@@ -3613,12 +4676,12 @@ msgstr "Postopek potreben za naloе╬itev `%s' ni podprt"
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/gnome-cal.c:1257
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1268
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naloе╬itev `%s' ni podprt"
@@ -3679,7 +4742,7 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr "Organizator mora biti naveden."
 
@@ -3835,12 +4898,6 @@ msgstr "pe"
 msgid "Sa"
 msgstr "so"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-local-storage.c:179
-#: shell/e-shortcuts.c:1025 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Naloge"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3874,8 +4931,8 @@ msgid "Print Calendar"
 msgstr "Natisni koledar"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1883 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:10
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
@@ -3906,10 +4963,10 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolucija je poskuе║ala vzeti vse posle, ki so bili v vaе║i mapi koledarja in "
-"jih prenesti v novo mapo poslov.\n"
-"Nekaterih poslov ni bilo mogoд█e prenesti, zato bo ta proces v prihodnosti е║e "
-"ponovljen."
+"Evolucija je poskuе║ala vzeti vse posle, ki so bili v vaе║i mapi koledarja "
+"in jih prenesti v novo mapo poslov.\n"
+"Nekaterih poslov ni bilo mogoд█e prenesti, zato bo ta proces v prihodnosti "
+"е║e ponovljen."
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
@@ -3917,8 +4974,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo preneе║en v mapo "
-"poslov."
+"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo preneе║en v "
+"mapo poslov."
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
@@ -4025,7 +5082,12 @@ msgstr ""
 "has-categories? priд█akuje, da so vsi argumenti nizi ali da je natanko en "
 "argument boolean neresniд█en (#f)"
 
-#: calendar/pcs/query.c:967
+#: calendar/pcs/query.c:805
+#, fuzzy
+msgid "is-completed? expects 0 arguments"
+msgstr "time-now ne priд█akuje argumentov"
+
+#: calendar/pcs/query.c:1008
 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)"
@@ -4369,7 +5431,8 @@ msgstr "Anonimno"
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
-msgstr "Ta moе╬nost narekuje povezavo s streе╬nikom z uporabo anonimne prijave."
+msgstr ""
+"Ta moе╬nost narekuje povezavo s streе╬nikom z uporabo anonimne prijave."
 
 #: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
@@ -4411,8 +5474,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Ta moе╬nost narekuje povezavo s streе╬nikom z uporabo varnega CRAM-MD5 gesla, "
-"д█e to podpira streе╬nik."
+"Ta moе╬nost narekuje povezavo s streе╬nikom z uporabo varnega CRAM-MD5 "
+"gesla, д█e to podpira streе╬nik."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -4459,7 +5522,8 @@ msgstr "Kerberos 4"
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Ta moе╬nost narekuje povezavo s streе╬nikom z uporabo avtentikacije Kerberos 4."
+"Ta moе╬nost narekuje povezavo s streе╬nikom z uporabo avtentikacije Kerberos "
+"4."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -4481,7 +5545,8 @@ msgstr "Prijava na 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 "Ta moе╬nost narekuje povezavo s streе╬nikom z uporabo enostavnega gesla."
+msgstr ""
+"Ta moе╬nost narekuje povezavo s streе╬nikom z uporabo enostavnega gesla."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -4489,7 +5554,7 @@ msgstr "Neznano stanje avtentifikacije."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "Geslo"
 
@@ -4518,37 +5583,37 @@ msgstr "Avtentifikacija POP pred SMTP z uporabo ne-pop vira"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabniе║kega imena"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "Razvozlujem: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Napaka ob poizvedbi imena: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
@@ -4718,21 +5783,21 @@ msgstr "Mapa je bila uniд█ena in na novo ustvarjena na streе╬niku."
 msgid "Scanning for changed messages"
 msgstr "Pregledujem za spremenjenimi sporoд█ili"
 
-#: camel/providers/imap/camel-imap-folder.c:1478
-#: camel/providers/imap/camel-imap-folder.c:1902
+#: camel/providers/imap/camel-imap-folder.c:1491
+#: 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:1620
-#: camel/providers/imap/camel-imap-folder.c:1701
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr "Prenaе║am povzetke novih sporoд█il"
 
-#: camel/providers/imap/camel-imap-folder.c:1626
+#: camel/providers/imap/camel-imap-folder.c:1640
 msgid "Scanning for new messages"
 msgstr "Pregledujem za novimi sporoд█ili"
 
-#: camel/providers/imap/camel-imap-folder.c:1935
+#: 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."
 
@@ -4749,7 +5814,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:655
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Mape"
 
@@ -4779,7 +5844,8 @@ msgstr "Za branje in hranjenje poе║te na streе╬nikih IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:82
 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."
+msgstr ""
+"Ta moе╬nost narekuje povezavo s streе╬nikom IMAP z neе║ifriranim geslom."
 
 #: camel/providers/imap/camel-imap-store.c:463
 #, c-format
@@ -4813,12 +5879,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:837 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takе║ne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1037
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starе║evski mapi ni dovoljeno vsebovati podmape"
 
@@ -5078,7 +6144,8 @@ msgstr "Delam povzetek mape"
 #: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarizing from position %ld: %s"
-msgstr "Nisem mogel odpreti mape: %s: povzetek delam od poloе╬aja %ld dalje: %s"
+msgstr ""
+"Nisem mogel odpreti mape: %s: povzetek delam od poloе╬aja %ld dalje: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
 #: camel/providers/local/camel-spool-summary.c:426
@@ -5094,8 +6161,9 @@ msgstr "Ne morem narediti povzetka mape: %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:1549
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Uskljajujem mapo %s"
 
 #: camel/providers/local/camel-mbox-summary.c:507
@@ -5306,35 +6374,35 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:193
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Prenaе║am povzetek POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nisem mogel preveriti streе╬nika POP za nova sporoд█ila: %s."
 
-#: camel/providers/pop3/camel-pop3-folder.c:239
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nisem mogel odpreti mape: seznam sporoд█il je bil nepopoln."
 
-#: camel/providers/pop3/camel-pop3-folder.c:332
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nisem mogel dobiti sporoд█ila: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:348
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nisem uspel prenesti sporoд█ila s streе╬nika POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporoд█ila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:375
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Prenaе║am sporoд█ilo POP %d"
@@ -5352,7 +6420,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:52
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5362,16 +6430,16 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 "Za povezovanje s streе╬niki POP. Protokol POP se lahko uporabi tudi za "
-"prenaе║anje poе║te iz nekaterih spletnih nuditeljev poе║te in zaprtih sistemov "
-"e-poе║te."
+"prenaе║anje poе║te iz nekaterih spletnih nuditeljev poе║te in zaprtih "
+"sistemov e-poе║te."
 
 #: 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 ""
-"Ta moе╬nost narekuje povezavo s streе╬nikom POP z neе║ifriranim geslom. To je v "
-"veд█ini edina moе╬nost, ki jo streе╬niki POP podpirajo."
+"Ta moе╬nost narekuje povezavo s streе╬nikom POP z neе║ifriranim geslom. To "
+"je v veд█ini edina moе╬nost, ki jo streе╬niki POP podpirajo."
 
 #: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
@@ -5447,7 +6515,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:71
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -5501,7 +6569,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:64
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5899,29 +6967,29 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr "Opozorilo!"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "Datoteka obstaja, prepiе║i?"
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5929,16 +6997,16 @@ msgstr ""
 "Ni mogoд█e odpreti mape osnutkov za ta raд█un.\n"
 "е╫elite uporabiti privzeto mapo osnutkov?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporoд█ila"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5947,7 +7015,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5956,7 +7024,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5965,15 +7033,16 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporoд█ila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolucija je zaznala neshranjene datoteke iz prejе║nje seje.\n"
 "е╫elite poskusiti obnovitev?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5983,24 +7052,24 @@ msgstr ""
 "\n"
 "е╫elite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1331 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:216
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: composer/e-msg-composer.c:1354
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1503
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:1877 composer/e-msg-composer.c:2318
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Sestavi novo sporoд█ilo"
 
-#: composer/e-msg-composer.c:2408
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
@@ -6041,70 +7110,81 @@ msgid "Body or subject contains"
 msgstr "Telo ali zadeva vsebuje"
 
 #: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Ime vsebuje"
+
+#: default_user/searches.xml.h:5
 msgid "Recipients contain"
 msgstr "Prejemniki vsebujejo"
 
-#: default_user/searches.xml.h:5
+#: default_user/searches.xml.h:6
 msgid "Sender contains"
 msgstr "Poе║iljatelj vsebuje"
 
-#: default_user/searches.xml.h:6
+#: default_user/searches.xml.h:7
 msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
-#: default_user/searches.xml.h:7
+#: default_user/searches.xml.h:8
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr "%d/%m/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr "%x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -6112,13 +7192,13 @@ 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
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -6236,7 +7316,7 @@ msgstr "%d %b %l:%M %p"
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Pravila filtriranja"
 
@@ -6258,7 +7338,7 @@ msgstr ""
 "Prosim pojdite nazaj in navedite veljavno mapo kamor naj se poе║ta dostavi."
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:808
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
@@ -6270,7 +7350,7 @@ msgstr "Vnesite URI mape"
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: filter/filter-input.c:197
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6320,30 +7400,22 @@ msgid "outgoing"
 msgstr "odhodna"
 
 #: filter/filter.glade.h:1
-msgid "Add"
-msgstr "Dodaj"
-
-#: filter/filter.glade.h:3
-msgid "Edit"
-msgstr "Uredi"
-
-#: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Uredi filtre"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Uredi vMape"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Dohodna"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Odhodna"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
@@ -6461,7 +7533,7 @@ msgstr "Odgovorjeno na"
 msgid "Score"
 msgstr "Toд█ke"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1070
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Poе║iljatelj"
 
@@ -6583,13 +7655,13 @@ msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Opa. Kot vir morate navesti vsaj eno mapo."
 
 #: importers/elm-importer.c: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/intelligent.c:194
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Uvozi"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Poе║ta"
 
@@ -6617,11 +7689,11 @@ msgstr ""
 "Evolucija je naе║la datoteke GnomeCard-a.\n"
 "Jih е╬elite uvoziti v Evolucijo?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6677,172 +7749,176 @@ msgstr "Tovarna za komponento povzetka poе║te."
 msgid "Mail configuration interface"
 msgstr "Vmesnik za nastavitev poе║te"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "vMapa glede na dopisni seznam"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr "Ta mapa ne more vsebovati sporoд█il."
 
-#: mail/component-factory.c:331
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#: mail/component-factory.c:331
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr "Spremeni lastnosti te mape"
 
-#: mail/component-factory.c:738
+#: mail/component-factory.c:757
 msgid "New Mail Message"
 msgstr "Novo poе║tno sporoд█ilo"
 
-#: mail/component-factory.c:738
+#: mail/component-factory.c:757
 msgid "New _Mail Message"
 msgstr "Novo _poе║tno sporoд█ilo"
 
-#: mail/component-factory.c:770
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za poе║to."
 
-#: mail/component-factory.c:907
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-ui.c:258
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: mail/folder-browser.c:233 mail/mail-display.c:281
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti zaд█asnega imenika: %s"
 
-#: mail/folder-browser.c:906
+#: mail/folder-browser.c:909
 msgid "Create vFolder from Search"
 msgstr "Ustvari vMapo iz iskanja"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _poе║iljatelja"
 
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poе║tni se_znam"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Filter glede na poе║ilja_telja"
 
-#: mail/folder-browser.c:1272
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1275
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oе║tni seznam"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporoд█ilo..."
 
-#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:96
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: mail/folder-browser.c:1290
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Odgovori poе║iljatelju"
 
-#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1299 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1301
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1304 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Oznaд█i kot _prebrano"
 
-#: mail/folder-browser.c:1306 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Oznaд█i kot _neprebrano"
 
-#: mail/folder-browser.c:1308
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr "Oznaд█i kot po_membno"
 
-#: mail/folder-browser.c:1310
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr "Oznaд█i kot ne_pomembno"
 
-#: mail/folder-browser.c:1315
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: mail/folder-browser.c:1317
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1321 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "O_dbriе║i"
 
-#: mail/folder-browser.c:1326
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "Poе║iljatelja dodaj v adresar"
 
-#: mail/folder-browser.c:1331
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1335
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "Iz sporoд█ila ustvari _pravilo"
 
-#: mail/folder-browser.c:1493
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filter glede na dopisni seznam"
 
-#: mail/folder-browser.c:1494
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMapa glede na dopisni seznam (%s)"
 
-#: mail/folder-info.c:60
+#: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Dobivam podatke o mapi"
 
@@ -6906,15 +7982,15 @@ msgid "Evolution News Editor"
 msgstr "Urejevalnik Evolucijinih novic"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih raд█unov"
 
-#: mail/mail-account-gui.c:998
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "Shrani podpis"
 
-#: mail/mail-account-gui.c:1004
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6924,6 +8000,10 @@ msgstr ""
 "\n"
 "е╫elite shraniti spremembe?"
 
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
 #: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (privzeto)"
@@ -6948,12 +8028,12 @@ msgstr "Ne zbriе║i"
 msgid "Really delete account?"
 msgstr "Resniд█no zbriе║i raд█un?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ste prepriд█ani, е╬elite zbrisati ta noviд█arski raд█un?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:41
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Nastavitev poе║te"
 
@@ -6981,7 +8061,7 @@ msgstr "%s poе║tnih seznamov"
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: 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"
@@ -6993,7 +8073,7 @@ msgstr ""
 "ali skladate poе║to.\n"
 "Bi ga е╬eleli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -7001,7 +8081,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate poе║to."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -7009,11 +8089,11 @@ msgstr ""
 "Nastaviti morate naд█in prenosa poе║te\n"
 "preden lahko skladate poе║to."
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Niste nastavili postopka prenaе║anja poе║te"
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -7021,7 +8101,7 @@ msgstr ""
 "To poroд█ilo nima 'zadeve'.\n"
 "Resniд█no poе║lji?"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -7029,41 +8109,40 @@ 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:338
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, д█e е╬eliti poslati sporoд█ilo."
 
-#: mail/mail-callbacks.c:389
+#: mail/mail-callbacks.c:390
 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:632
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "Na %s, je %s zapisal(a):"
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Posredovano sporoд█ilo:\n"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Prestavi sporoд█ilo(a) v"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporoд█ilo(a) v"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1366
 #, 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:1383
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -7071,7 +8150,7 @@ msgstr ""
 "Urejate lahko le sporoд█ila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:1417
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -7079,40 +8158,46 @@ msgstr ""
 "Znova lahko poе║ljete le sporoд█ila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:1429
+#: mail/mail-callbacks.c:1434
 #, 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:1450
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporoд█ilo"
 
-#: mail/mail-callbacks.c:1535
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Shrani sporoд█ilo kot..."
 
-#: mail/mail-callbacks.c:1537
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Shrani sporoд█ila kot..."
 
-#: mail/mail-callbacks.c:1679 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: mail/mail-callbacks.c:1686
+#: mail/mail-callbacks.c:1714
+#, fuzzy
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages. \n"
-" \n"
-" Really erase these messages? "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
 "Ta operacija bo trajno zbrisala vsa sporoд█ila oznaд█ena kot zbrisana. д▄e "
 "boste nadaljevali ne boste mogli veд█ do teh sporoд█il. \n"
 " \n"
 " Resniд█no zbriе║i ta sporoд█ila? "
 
-#: mail/mail-callbacks.c:1788
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Ne spraе║uj me veд█"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -7121,68 +8206,78 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1798
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:1844
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Natisni sporoд█ilo"
 
-#: mail/mail-callbacks.c:1890
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Tiskanje sporoд█ila ni uspelo"
 
-#: mail/mail-callbacks.c:1974
+#: mail/mail-callbacks.c:2012
 #, 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-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "Prosimo spodaj vpiе║ite svoje ime in e-poе║tni naslov. Polj \"po е╬elji\" ni "
 "potrebno izpolniti, razen, д█e ne е╬elite vkljuд█iti te podatke v e-poе║to, ki "
 "jo boste poе║iljali."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
-"Prosimo spodaj vpiе║ite podatke o vaе║em streе╬niku dohodne poе║te. д▄e ne veste "
-"katero vrsto streе╬nika uporabljate se obrnite na vaе║ega sistemskega "
+"Prosimo spodaj vpiе║ite podatke o vaе║em streе╬niku dohodne poе║te. д▄e ne "
+"veste katero vrsto streе╬nika uporabljate se obrnite na vaе║ega sistemskega "
 "administratorja ali ponudnika internet dostopa."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
-"Prosimo spodaj vpiе║ite podatke o vaе║em streе╬niku odhodne poе║te. д▄e ne veste "
-"kater protokol uporabljatie se obrnite na vaе║ega sistemskega administratorja "
-"ali ponudnika internet dostopa."
+"Prosimo spodaj vpiе║ite podatke o vaе║em streе╬niku odhodne poе║te. д▄e ne "
+"veste kater protokol uporabljatie se obrnite na vaе║ega sistemskega "
+"administratorja ali ponudnika internet dostopa."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "S procesom nastavljanja poе║te ste skoraj pri koncu. Identiteta, streе╬nik "
-"prihajajoд█e poе║te in metoda poе║iljanja poе║te bodo zdruе╬ene skupaj in tako bo "
-"ustvarjen raд█un poе║te Evolucija. Prosimo v prostor spodaj vpiе║ite ime za ta "
-"raд█un. Ime bo uporabljeno le za prikaz."
+"prihajajoд█e poе║te in metoda poе║iljanja poе║te bodo zdruе╬ene skupaj in "
+"tako bo ustvarjen raд█un poе║te Evolucija. Prosimo v prostor spodaj vpiе║ite "
+"ime za ta raд█un. Ime bo uporabljeno le za prikaz."
 
 #. set window title
-#: mail/mail-config-druid.c:464
+#: mail/mail-config-druid.c:558
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za raд█une"
 
@@ -7191,16 +8286,16 @@ msgstr "Evolucijin druid za raд█une"
 #. * name. I don't think this will work with maildir. How can we figure out
 #. * what shortcut to insert?
 #.
-#: mail/mail-config.c:1534
+#: mail/mail-config.c:1579
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Dohdona poе║ta"
 
-#: mail/mail-config.c:1764
+#: mail/mail-config.c:1809
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: mail/mail-config.c:1835 mail/mail-config.c:1838
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s streе╬nikom..."
 
@@ -7300,7 +8395,7 @@ msgstr "Prikaz"
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:175
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Osnutki"
 
@@ -7312,197 +8407,202 @@ msgstr "Mapa osnutkov:"
 msgid "E_nable"
 msgstr "_Vkljuд█i"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Shrani trenutno datoteko pod drugim imenom"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Vkljuд█eno"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Dobi digitalni ID..."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "Datoteka s podpisom HTML:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "V poе║ti HTML"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Kot del sporoд█ila"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Nastavitev poе║te"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Mesto poе║tnega predala"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Naj bo to moj p_rivzet raд█un"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr "Privzet naj bo _predogled sporoд█ila"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr "Seznam sporoд█il naj bo privzeto prikazan _niteno"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "Streе╬nik NNTP"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Novice"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Podatki po е╬elji"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "ID kljuд█a PGP:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy (precej dobra zasebnost)"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Zahtevaj potrditev ob poе║iljanju sporoд█il bre_z predmeta"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Zahtevaj potrditev ob poе║iljanju sporoд█il, ki imajo le BCC prejemnike"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Poе║tni imenik Qmail"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Sprejemam e-poе║to"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Sprejemanje poе║te"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Moе╬nosti sprejema"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "Varni MIME"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Izberi datoteko za dnevnik filtra..."
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Poе║iljam e-poе║to"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Poе║iljanje poе║te"
 
-#: mail/mail-config.glade.h:72 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:178
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Poslano"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporoд█ila in osnutki"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Mapa poslanih sporoд█il:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Nastavitev streе╬nika"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Vrsta streе╬nika:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
 msgstr "Streе╬nik zahteva _avtentifikacijo"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Viri"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Posebne mape"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Obiд█ajnen Unix poе║tni predal"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr "Uporabi varno povezavo (_SSL)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -7512,103 +8612,103 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za zaд█etek. "
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "_Vedno naloе╬i slike s spleta"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
 msgstr "_Samodejno preveri za novo poе║to vsakih"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
 msgstr "_Preveri za podprte tipe"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
 msgstr "_E-poе║tni naslov:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
 msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Full Name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "Podpis _HTML:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr "_Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
 msgstr "_Naloе╬i slike, д█e je poе║iljatelj v adresarju"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
 msgstr "_Oznaд█i sporoд█ila kot prebrana po:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr "_Nikoli ne naloе╬i slik s spleta"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Organization:"
 msgstr "_Organizacija:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr "Pot do izvrе║ljive datoteke _PGP"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "_Pot:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr "Do izhoda pomni geslo PGP"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Zapomni si to geslo"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "Privzeto poе║iljaj poе║to v _HTML obliki."
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "Datoteka s _podpisom:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "_Uporabniе║ko ime:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr "oknonovic1"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr "drе╬alec mesta"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "sekund."
 
@@ -7665,36 +8765,36 @@ msgstr "Poglej vsebino"
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:402
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:406
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:427
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "zunanjem pregledovalniku"
 
-#: mail/mail-display.c:1051
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporoд█ila"
 
-#: mail/mail-display.c:1407
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1409
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1411
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1413
+#: mail/mail-display.c:1417
 msgid "Save Image as..."
 msgstr "Shrani sliko kot..."
 
@@ -7815,17 +8915,22 @@ msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 msgid "Malformed external-body part."
 msgstr "Napaд█no oblikovano dodatno telo sporoд█ila."
 
-#: mail/mail-local.c:466
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Ni takе║ne mape %s"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Odpiram '%s'"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7834,7 +8939,7 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste veд█ mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:914
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7842,11 +8947,11 @@ msgstr ""
 "д▄e ne morete veд█ odpreti tega poе║tnega predala, potem\n"
 "ga boste morda morali popraviti roд█no."
 
-#: mail/mail-local.c:1007
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ne morete spremeniti oblike zapisa map, ki niso krajevne."
 
-#: mail/mail-local.c:1018
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Znova nastavi %s"
@@ -7901,7 +9006,7 @@ msgstr "Poе║iljam sporoд█ilo %d od %d"
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporoд█ilu %d od %d"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Konд█ano."
 
@@ -7933,7 +9038,7 @@ msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:180
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Smeti"
 
@@ -7941,7 +9046,7 @@ msgstr "Smeti"
 msgid "Forwarded messages"
 msgstr "Posredovana sporoд█ila"
 
-#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
@@ -7951,35 +9056,45 @@ msgstr "Odpiram mapo %s"
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Ustvari novo mapo"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1599
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Uskladi \"%s\""
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Osveе╬ujem mapo"
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Uniд█ujem mapo"
 
-#: mail/mail-ops.c:1684
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenaе║am sporoд█ilo %s"
 
-#: mail/mail-ops.c:1751
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Prenaе║am %d sporoд█il"
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Shranjujem %d sporoд█il"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7988,7 +9103,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7997,11 +9112,11 @@ msgstr ""
 "Napaka ob shranjevanju sporoд█il v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -8010,12 +9125,12 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
@@ -8072,7 +9187,7 @@ msgstr "Posodabljam..."
 msgid "Waiting..."
 msgstr "д▄akam..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Preklicano."
 
@@ -8098,11 +9213,11 @@ msgstr "Posredovano sporoд█ilo"
 msgid "Forwarded Message"
 msgstr "Posredovano sporoд█ilo"
 
-#: mail/mail-vfolder.c:282
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
@@ -8171,7 +9286,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2314
+#: mail/message-list.c:2312
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporoд█il"
 
@@ -8187,36 +9302,36 @@ msgstr "Sprejeto"
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/subscribe-dialog.c:166
+#: mail/subscribe-dialog.c:174
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Pregledujem mape pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Pregledujem korenske mape na \"%s\""
 
-#: mail/subscribe-dialog.c:267
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Naroд█am se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:269
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Preklicujem naroд█nino na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mapa"
 
-#: mail/subscribe-dialog.c:1432
+#: mail/subscribe-dialog.c:1490
 msgid "No server has been selected"
 msgstr "Streе╬nik ni bil izbran"
 
-#: mail/subscribe-dialog.c:1489
+#: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
 msgstr "Prosimo izberite streе╬nik."
 
@@ -8260,6 +9375,10 @@ msgstr "Evolucijina komponenta za povzetke."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Tovarna za Evolucijine komponente za povzetke."
 
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
 #: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
@@ -8280,31 +9399,40 @@ msgstr "%l:%M%p"
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "Povzetek poе║te"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com beseda dneva"
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr "Citati dneva"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr "Dodaj vir novic"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Vpiе║ite vir novic, ki ga е╬elite dodati"
 
-#: my-evolution/e-summary-preferences.c:881
+#: my-evolution/e-summary-preferences.c:889
 msgid "Name:"
 msgstr "Ime:"
 
-#: my-evolution/e-summary-preferences.c:1403
+#: my-evolution/e-summary-preferences.c:1421
 msgid "Summary Settings"
 msgstr "Nastavitev povzetka"
 
@@ -8316,6 +9444,11 @@ msgstr "Napaka ob prenaе║anju vira novic."
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Napaka ob prenaе║anju RDF</b>"
 
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "_Viri novic"
+
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr "Brez nalog"
@@ -8324,11 +9457,16 @@ msgstr "Brez nalog"
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Streе╬nik vremena ni dosegljiv</b></dd>"
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "_Vreme"
+
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Obmoд█ja"
 
@@ -9552,11 +10690,6 @@ msgstr "Vse _mape:"
 msgid "All news _feeds:"
 msgstr "Vsi viri _novic:"
 
-#: my-evolution/my-evolution.glade.h:6 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1024
-msgid "Calendar"
-msgstr "Koledar"
-
 #: my-evolution/my-evolution.glade.h:7
 msgid "How many days should the calendar display at once?"
 msgstr "Koliko dni naj koledar pokaе╬e hkrati?"
@@ -9665,17 +10798,15 @@ msgstr "Kaе╬i podrobnosti"
 msgid "Cancel Operation"
 msgstr "Prekliд█i operacijo"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1023
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
 msgid "Inbox"
 msgstr "Dohodna poе║ta"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:178
 msgid "Outbox"
 msgstr "Odhodna poе║ta"
 
-#: shell/e-local-storage.c:591
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Krajevne mape"
 
@@ -9731,7 +10862,7 @@ msgstr ""
 "`%s'\n"
 " se je zgodila napaka."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9742,7 +10873,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniе║kih datotek nadaljuje."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9756,7 +10887,7 @@ msgstr ""
 "lahko Evolucija poе╬ene.\n"
 "е╫elite, da odstranim ta imenik?"
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9779,25 +10910,25 @@ msgstr "Ne morem kopirati mape nase."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Ne morem kopirati mape v eno od naslednic."
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, 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:289
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Kopiraj mapo"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, 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:332
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Prestavi mapo"
 
-#: shell/e-shell-folder-commands.c:357
+#: shell/e-shell-folder-commands.c:358
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -9806,30 +10937,30 @@ msgstr ""
 "Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Zbriе║i mapo '%s'"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Ste prepriд█ani, da е╬elite zbrisati mapo '%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:458
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Preimenuj mapo '%s'"
 
-#: shell/e-shell-folder-commands.c:462 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Preimenuj"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:470
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ime mape:"
@@ -9859,11 +10990,11 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
@@ -9903,7 +11034,7 @@ msgstr ""
 "Uvaе╬am %s\n"
 "Uvaе╬am predmet %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9960,11 +11091,11 @@ msgstr "Izberi datoteko"
 msgid "File type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
@@ -9972,19 +11103,41 @@ msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
-#: shell/e-shell-view-menu.c:182
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Ne morem inicializirati lupine Evolucije: %s"
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 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:190
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoд█e pognati."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Avtorske pravice pridrе╬ane 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:220
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9994,89 +11147,89 @@ msgstr ""
 "GNOME za delo v skupinah, za poе║to, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:436
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo е╬elite odpreti"
 
-#: shell/e-shell-view-menu.c:582
+#: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
 msgstr "Ustvari novo bliе╬njico"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:570
 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:701
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr "Delaj na mreе╬i"
 
-#: shell/e-shell-view-menu.c:714 shell/e-shell-view-menu.c:727
-#: ui/evolution.xml.h:35
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Delaj brez mreе╬e"
 
-#: shell/e-shell-view.c:178
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:1391
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolucija %s"
 
-#: shell/e-shell-view.c:1393
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolucija %s [%s]"
 
-#: shell/e-shell-view.c:1431
+#: shell/e-shell-view.c:1499
 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:1438
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr "Evolucija je v procesu odklapljanja z mreе╬e."
 
-#: shell/e-shell-view.c:1444
+#: shell/e-shell-view.c:1512
 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.c:508
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1424
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views 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-shell.c:1628 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "V redu"
 
-#: shell/e-shell.c:1630
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:1632
+#: shell/e-shell.c:1646
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:1634
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:1636 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "Generiд█na napaka"
 
@@ -10169,7 +11322,7 @@ msgstr "Preimenuj izbrano bliе╬njico v:"
 msgid "Open the folder linked to this shortcut"
 msgstr "Odpri mapo povezano s to bliе╬njico"
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Odpri v novem oknu"
 
@@ -10185,11 +11338,11 @@ msgstr "Preimenuj to bliе╬njico"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bliе╬njico iz vrstice bliе╬njic"
 
-#: shell/e-shortcuts.c:620
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bliе╬njic."
 
-#: shell/e-shortcuts.c:1019
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr "Bliе╬njice"
 
@@ -10197,46 +11350,51 @@ msgstr "Bliе╬njice"
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom е╬e obstaja"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Izbran tip mape ni veljaven"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:511
 msgid "The specified folder cannot be modified or removed"
 msgstr "Izbrane mape ni moе╬no spremeniti ali odstraniti"
 
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Ne morem kopirati mape v eno od naslednic."
+
 #: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
@@ -10336,7 +11494,8 @@ msgstr ""
 "Pozdrav.  Hvala, ker ste si vzeli д█as za prenos te predogledne izdaje\n"
 "programja za delovne skupine Evolucija.\n"
 "\n"
-"Evolucija е║e ni konд█ana. е═e vedno so kraji, kjer funkcionalnost manjka ali\n"
+"Evolucija е║e ni konд█ana. е═e vedno so kraji, kjer funkcionalnost manjka "
+"ali\n"
 "deluje le poloviд█no.\n"
 "\n"
 "д▄e najdete hroе║д█a, ga prosimo sporoд█ite na bugzilla.ximian.com.\n"
@@ -10375,8 +11534,8 @@ msgstr "Poе║lji razhroе║д█evalna sporoд█ila vseh komponent v datoteko."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopiraj"
 
@@ -10392,11 +11551,11 @@ msgstr "Ustvari nov stik"
 msgid "Create new contact list"
 msgstr "Ustvari nov seznam stikov"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Izreе╬i"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Izreе╬i izbrano"
 
@@ -10404,89 +11563,93 @@ msgstr "Izreе╬i izbrano"
 msgid "Delete selected contacts"
 msgstr "Zbriе║i izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Nov stik"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "New List"
 msgstr "Nov seznam"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Prilepi"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Prilepi odloе╬iе║д█e"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Predogled stikov, ki bodo natisnjeni"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Natisni izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Shrani izbrane kontakte kot eVizitke"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Izberi vse stike"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Send _contact to other"
-msgstr "Poе║lji _stik drugim"
-
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send _message to contact"
-msgstr "Stiku poе║lji _sporoд█ilo"
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Poе║lji _sporoд█ilo stiku..."
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send a mess to the selected contacts."
 msgstr "Poе║lji poroд█ilo izbranim stikom."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Stiku poе║lji sporoд█ilo"
+
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
 msgstr "Poе║lji izbrane stike drugi osebi."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:31
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "_Dejanja"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "Viri _adresarja..."
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Stik"
 
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact List"
 msgstr "Seznam _stikov"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
-#: ui/evolution-contact-editor.xml.h:16 ui/my-evolution.xml.h:7
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Stiki..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Na_tisni..."
 
@@ -10495,16 +11658,17 @@ msgid "_Save as VCard"
 msgstr "_Shrani kot eVizitko"
 
 #: ui/evolution-addressbook.xml.h:38
-msgid "_Search for contacts"
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Iе║д█i po kontaktih"
 
 #: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "_Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:20
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Orodja"
@@ -10514,106 +11678,122 @@ msgid "Configure the calendar's settings"
 msgstr "Nastavi pogled koledarja"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All-Day _Event"
+#, fuzzy
+msgid "Create a New All Day _Event"
 msgstr "Ustvari nov celodnevni _dogodek"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a _New Appointment"
-msgstr "Ustvari _nov sestanek"
+#, fuzzy
+msgid "Create a New _Task"
+msgstr "Ustvari nov posel"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Ustvari nov sestanek"
+msgid "Create a _New Appointment"
+msgstr "Ustvari _nov sestanek"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "Ustvari sestanek, ki zavzame cel dan"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:10 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Zbriе║i ta sestanek"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back"
 msgstr "Pojdi nazaj"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward"
 msgstr "Pojdi naprej"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Pojdi na doloд█en datum"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to today"
 msgstr "Pojdi na danes"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nov sestanek"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Nova naloga"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:21 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
 msgstr "Predogled _tiskanja"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Publish Free/Busy Information"
-msgstr "Objavi podatek o zasedenosti"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi podatek o zasedenosti za ta koledar"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Kaе╬i en dan"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Kaе╬i en mesec"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Kaе╬i en teden"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show work week"
-msgstr "Kaе╬i en delovni teden"
+#: ui/evolution-calendar.xml.h:31
+msgid "Show the working week"
+msgstr "Pokaе╬i delavni teden"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Teden"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "_Sestanek..."
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "_Nastavitve poе║te..."
 
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Objavi podatek o zasedenosti"
+
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_Naloga"
+
 #: 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
@@ -10623,15 +11803,16 @@ msgid "Close"
 msgstr "Zapri"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Zapri ta sestanek"
+#, fuzzy
+msgid "Close this item"
+msgstr "Zbriе║i ta predmet"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Zbriе║i ta sestanek"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Zbriе║i ta predmet"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Glavna orodna vrstica"
 
@@ -10639,85 +11820,58 @@ msgstr "Glavna orodna vrstica"
 msgid "Preview the printed item"
 msgstr "Predogled natisnjenega predmeta"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print S_etup"
-msgstr "Nastavitev t_iskanja"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Natisni ta predmet"
 
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Natisni..."
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Shrani"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Shrani in zapri"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
-msgstr "Shrani sestanek in zapri dialog"
+#: ui/evolution-comp-editor.xml.h:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Shrani seznam in zapri dialog"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Shrani ta predmet na disk"
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Nastavi lastnosti strani za vaе║ trenutni tiskalnik"
-
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Zbriе║i ta predmet"
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Pomoд█"
-
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Natisni kuverto..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
-msgid "Save"
-msgstr "Shrani"
-
-#: ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Shrani _kot..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Shrani stik in zapri dialog"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Poе║lji stik drugim..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Glej pomoд█ na liniji"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Poе║lji _sporoд█ilo stiku..."
-
-#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
@@ -10748,19 +11902,19 @@ msgstr "Poе║lji _sporoд█ilo na seznam..."
 msgid "Cancel Mee_ting"
 msgstr "Prekliд█i ses_tanek"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "Prekliд█i sestanek za ta predmet"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Posreduj naprej preko e-poе║te"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr "Dobi osveе╬ene podatke o sestanku"
 
@@ -10772,7 +11926,7 @@ msgstr "Osveе╬i sestanek"
 msgid "Schedule _Meeting"
 msgstr "_Naд█rtuj sestanek"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Naд█rtuj sestanek za ta predmet"
 
@@ -10789,37 +11943,38 @@ msgid "Cancel the current mail operation"
 msgstr "Prekliд█i trenutno operacijo poе║te"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Sestavi"
-
-#: ui/evolution-mail-global.xml.h:4
 msgid "Compose _New Message"
 msgstr "Sestavi _novo sporoд█ilo"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 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:6
+#: ui/evolution-mail-global.xml.h:5
 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:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "Ustvari ali uredi doloд█itve navideznih map"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Sprazni _smeti"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 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
+#, fuzzy
+msgid "New Message"
+msgstr "Naslednje sporoд█ilo"
+
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "Odpri okno za sestavljanje novega poе║tnega sporoд█ila"
@@ -10876,96 +12031,101 @@ msgstr "_Naroд█i se na mape..."
 msgid "Change the properties of this folder"
 msgstr "Spremeni lastnosti te mape"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Kopiraj izbrana sporoд█ila"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Izreе╬i"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Izreе╬i izbrana sporoд█ila"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Skrij _izbrana sporoд█ila"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Skrij _zbrisana sporoд█ila"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Skrij _prebrana sporoд█ila"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Raje skrij zbrisana sporoд█ila kot, da so prikazana preд█rtana"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Oznaд█i vs_e kot prebrano"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Oznaд█i vsa vidna sporoд█ila kot prebrana"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Prilepi sporoд█ilo na odloе╬iе║д█e"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trajno odstrani vsa zbrisana sporoд█ila iz te mape"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Izberi _vse"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Izberi ni_t"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Izberi vse in le tista sporoд█ila, ki trenutno niso izbrana"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Izberi vsa sporoд█ila iz iste niti kot izbrano sporoд█ilo"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Izberi vsa vidna sporoд█ila"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "K_aе╬i skrita sporoд█ila"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Kaе╬i sporoд█ila, ki so bila zaд█asno skrita"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Zaд█asno skrij vsa е╬e prebrana sporoд█ila"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Zaд█asno skrij vsa izbrana sporoд█ila"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Niten seznam sporoд█il"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:25
 msgid "_Expunge"
 msgstr "_Uniд█i"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Mapa"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
@@ -11186,7 +12346,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "Odpri izbrano sporoд█ilo v skladatelju za vnoviд█no poе║iljanje"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Predogled sporoд█ika, ki bo natisnjeno"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11205,38 +12366,34 @@ msgstr "Prejе║nje sporoд█ilo"
 msgid "Previous Unread Message"
 msgstr "Prejе║nje neprebrano sporoд█ilo"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "Natisni sporoд█ilo..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "Predogled tiskanja..."
-
-#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Natisni to sporoд█ilo"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "_Iе║д█i v sporoд█ilu"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "Shrani sporoд█ilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr "Iе║д█i besedilo v telesu prikazanega sporoд█ila"
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Nastavi lastnosti strani za vaе║ trenutni tiskalnik"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Kaе╬i _izvorno kodo poе║te"
@@ -11316,12 +12473,12 @@ msgstr "Zapri to okno"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Zapri"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "Po_gled"
 
@@ -11512,7 +12669,7 @@ msgstr "Polje _Odgovori-na:"
 msgid "_Security"
 msgstr "_Varnost"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Pomoд█"
 
@@ -11545,14 +12702,30 @@ msgid "Unsubscribe"
 msgstr "Prekini naroд█nino"
 
 #: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Assign Task"
+msgstr "FIXME: Dodali _nalogo"
+
+#: ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Assign this task to others"
+msgstr "Nekomu dodeli nalogo"
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Prekliд█i opravilo"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
-msgstr "Delegiraj opravilo"
+#: ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Cancel this task"
+msgstr "Prekliд█i opravilo"
 
 #: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Obtain the latest task information"
+msgstr "Dobi osveе╬ene podatke o sestanku"
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "Osveе╬i opravilo"
 
@@ -11560,43 +12733,28 @@ msgstr "Osveе╬i opravilo"
 msgid "Configure the task view's settings"
 msgstr "Nastavi pogled nalog"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "Kopiraj izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Ustvari nov posel"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "Izreе╬i izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 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:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Prilepi opravilo z odloе╬iе║д█a"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr "Shrani posel kot nekaj drugega"
-
 #: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings"
+#, fuzzy
+msgid "Tasks Settings..."
 msgstr "Nastavitve nalog"
 
 #: ui/evolution-tasks.xml.h:17
-msgid "_Print Task..."
-msgstr "Na_tisni nalogo..."
-
-#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Naloga"
 
@@ -11653,122 +12811,103 @@ msgid "Exit the program"
 msgstr "Izhod iz programa"
 
 #: ui/evolution.xml.h:16
-msgid "Getting _Started"
-msgstr "Kako _zaд█eti"
-
-#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr "Uvozi datoteko zunanje oblike"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "Prestavi to mapo na drugo mesto"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "Odpri v novem _oknu"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Odpri to mapo v drugem oknu"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Kaе╬i podatke o Evoluciji"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Poе║lji poroд█ilo o hroе║д█u"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "_Poе║lji poroд█ilo o hroе║д█u"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Poе║lji poroд█ilo o hroе║д█u z uporabo progama Bug buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bliе╬njicami"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mreе╬o"
 
-#: ui/evolution.xml.h:31
-msgid "Using the C_ontact Manager"
-msgstr "Uporaba upravljalnika _stikov"
-
-#: ui/evolution.xml.h:32
-msgid "Using the _Calendar"
-msgstr "Uporaba _koledarja"
-
-#: ui/evolution.xml.h:33
-msgid "Using the _Mailer"
-msgstr "Uporaba _poе║te"
-
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:46
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "_Uvozi datoteko..."
 
-#: ui/evolution.xml.h:47
-msgid "_Index"
-msgstr "_Kazalo"
-
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Bliе╬njica"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bliе╬njicami"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "_Delaj brez mreе╬e"
 
@@ -11824,6 +12963,28 @@ msgstr "Sporoд█ila"
 msgid "With Category"
 msgstr "S kategorijo"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Izberi д█asovni pas"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Izbira"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "д▄asovni pasovi"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"Uporabite lev miе║kin gumb za poveд█avo obmoд█ja zemljevida in izbiro "
+"д█asovnega pasu.\n"
+" Uporabite desni miе║kin gumb za pomanjе║avo."
+
 #. 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
@@ -11918,11 +13079,11 @@ msgstr "PTSд▄PSN"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Sedaj"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Danes"
 
@@ -12049,11 +13210,11 @@ msgstr "Sporoд█ilo"
 msgid "Don't show this message again."
 msgstr "Tega sporoд█ila ne kaе╬i veд█."
 
-#: widgets/misc/e-search-bar.c:333
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_Iskanje"
 
-#: widgets/misc/e-search-bar.c:459
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Iе║д█i sedaj"
 
@@ -12077,6 +13238,90 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#~ msgid "RDF Summary"
+#~ msgstr "Povzetek RDF"
+
+#~ msgid "USA"
+#~ msgstr "ZDA"
+
+#~ msgid "Send contact to other"
+#~ msgstr "Poе║lji stik drugim"
+
+#~ msgid "_12 hour (am/pm)"
+#~ msgstr "_12 urna (dop./pop.)"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Edit"
+#~ msgstr "Uredi"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "Na %s, je %s zapisal(a):"
+
+#~ msgid "New contact"
+#~ msgstr "Nov stik"
+
+#~ msgid "Send _contact to other"
+#~ msgstr "Poе║lji _stik drugim"
+
+#~ msgid "Send _message to contact"
+#~ msgstr "Stiku poе║lji _sporoд█ilo"
+
+#~ msgid "Show work week"
+#~ msgstr "Kaе╬i en delovni teden"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Zapri ta sestanek"
+
+#~ msgid "Print S_etup"
+#~ msgstr "Nastavitev t_iskanja"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Shrani sestanek in zapri dialog"
+
+#~ msgid "Help"
+#~ msgstr "Pomoд█"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Poе║lji stik drugim..."
+
+#~ msgid "See online help"
+#~ msgstr "Glej pomoд█ na liniji"
+
+#~ msgid "Compose"
+#~ msgstr "Sestavi"
+
+#~ msgid "Print Message..."
+#~ msgstr "Natisni sporoд█ilo..."
+
+#~ msgid "Print Preview..."
+#~ msgstr "Predogled tiskanja..."
+
+#~ msgid "Delegate Task"
+#~ msgstr "Delegiraj opravilo"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Shrani posel kot nekaj drugega"
+
+#~ msgid "_Print Task..."
+#~ msgstr "Na_tisni nalogo..."
+
+#~ msgid "Getting _Started"
+#~ msgstr "Kako _zaд█eti"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Uporaba upravljalnika _stikov"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Uporaba _koledarja"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Uporaba _poе║te"
+
+#~ msgid "_Index"
+#~ msgstr "_Kazalo"
+
 #~ msgid "???"
 #~ msgstr "???"
 
@@ -12095,9 +13340,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "LDAP Server"
 #~ msgstr "Streе╬nik LDAP"
 
-#~ msgid "File"
-#~ msgstr "Datoteka"
-
 #~ msgid "Unknown addressbook type"
 #~ msgstr "Neznan tip adresarja"
 
@@ -12314,9 +13556,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
 
@@ -12332,9 +13571,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Receiving"
 #~ msgstr "Sprejemam"
 
-#~ msgid "Sending"
-#~ msgstr "Poе║iljam"
-
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (posredovano sporoд█ilo)"
 
@@ -12402,9 +13638,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Settings..."
 #~ msgstr "Nastavitve..."
 
-#~ msgid "Show the working week"
-#~ msgstr "Pokaе╬i delavni teden"
-
 #~ msgid "W_ork Week"
 #~ msgstr "_Delavni teden"
 
@@ -12513,9 +13746,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Alarms timeout after"
 #~ msgstr "Alarmi preteд█ejo д█ez"
 
-#~ msgid "Colors"
-#~ msgstr "Barve"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "Omogoд█i podaljе║anje spanja za"
 
@@ -12643,7 +13873,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nisem mogel е║ifrirati: nisem uspel ustvariti konteksta е║ifriranja"
 
 #~ msgid "Could not encrypt data: invalid user key: \"%s\"."
-#~ msgstr "Nisem mogel е║ifrirati podatkov: neveljaven kljuд█ uporabnika \"%s\"."
+#~ msgstr ""
+#~ "Nisem mogel е║ifrirati podatkov: neveljaven kljuд█ uporabnika \"%s\"."
 
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "Nisem mogel е║ifirirati: enkodiranje ni uspelo."
@@ -12773,9 +14004,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Factory for the RDF summary."
 #~ msgstr "Tovarna za povzetke RDF."
 
-#~ msgid "RDF Summary"
-#~ msgstr "Povzetek RDF"
-
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "Tovarna za preizkusno komponento bonobo."
 
@@ -12917,9 +14145,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Create a new email"
 #~ msgstr "Ustvari novo e-poе║to"
 
-#~ msgid "New Mail"
-#~ msgstr "Nova poе║ta"
-
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "_Vstavi datoteko z besedilom... (FIXME)"
 
@@ -13022,9 +14247,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr "Posreduj to sporoд█ilo kot del vaе║e poе║te, da ga lahko uredite"
 
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "Skrij zbrisana sporoд█ila"
-
 #~ msgid "Invert Selection"
 #~ msgstr "Obrni izbor"
 
@@ -13136,7 +14358,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "е═tevilka vrat v URL '%s' ni numeriд█na"
 
 #~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
-#~ msgstr "Za branje in hranjenje poе║te na IMAP streе╬nikih preko povezave SSL."
+#~ msgstr ""
+#~ "Za branje in hranjenje poе║te na IMAP streе╬nikih preko povezave SSL."
 
 #~ msgid "Secure POP"
 #~ msgstr "Varni POP"
@@ -13147,8 +14370,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "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 ""
 #~ "For delivering mail by connecting to a remote mailhub using SMTP over an "
@@ -13207,8 +14430,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."
@@ -13575,9 +14798,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Click \"Next\" to begin. "
 #~ msgstr "Kliknite \"Naprej\" za zaд█etek. "
 
-#~ msgid "FIXME: Assig_n Task"
-#~ msgstr "FIXME: Dodali _nalogo"
-
 #~ msgid "FIXME: Ch_oose Form..."
 #~ msgstr "FIXME: Izberi izmed..."
 
@@ -13835,9 +15055,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Vendar se bo sestanek ponovil pravoд█asno in bo  pravilno prikazan v "
 #~ "pogledu koledarja."
 
-#~ msgid "may"
-#~ msgstr "maj"
-
 #~ msgid "sept"
 #~ msgstr "sept"
 
@@ -13952,9 +15169,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Time format"
 #~ msgstr "Oblika izpisa д█asa"
 
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 urna (dop./pop.)"
-
 #~ msgid "24-hour"
 #~ msgstr "24 urna"
 
@@ -14050,9 +15264,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "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"
@@ -14067,8 +15281,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "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"
+#~ "Izberite vrsto poе║tnega streе╬nika, ki ga uporabljate, in nastavite "
+#~ "zanj  potrebne podatke.\n"
 #~ "\n"
 #~ "д▄e streе╬nik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
 #~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
@@ -14080,8 +15294,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "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"
+#~ "Izberite vrsto poе║tnega streе╬nika, ki ga uporabljate, in nastavite "
+#~ "zanj  potrebne podatke.\n"
 #~ "\n"
 #~ "д▄e streе╬nik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
 #~ "podprte tipe...\", po tem ko boste vnesli ostale podatke."
@@ -14188,9 +15402,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Exception while reporting result to shell component listener."
 #~ msgstr "Izjema med sporoд█anjem rezultatov lupini"
 
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Uskladi \"%s\""
-
 #~ msgid "Displaying message UID \"%s\""
 #~ msgstr "Prikazujem sporoд█ilo z UID \"%s\""
 
@@ -14314,9 +15525,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "FIXME: Assign Task..."
 #~ msgstr "FIXME: _Dodeli nalogo..."
 
-#~ msgid "Assign the task to someone"
-#~ msgstr "Nekomu dodeli nalogo"
-
 #~ msgid "FIXME: Delete"
 #~ msgstr "FIXME: Zbriе║i"
 
@@ -14379,9 +15587,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Ur\n"
 #~ "Dni\n"
 
-#~ msgid "Daily"
-#~ msgstr "Dnevne"
-
 #~ msgid "Weekly"
 #~ msgstr "Tedenske"
 
@@ -14451,9 +15656,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Hour"
 #~ msgstr "Ura"
 
-#~ msgid "Minute"
-#~ msgstr "Minuta"
-
 #~ msgid "Second"
 #~ msgstr "Sekunda"
 
@@ -14548,9 +15750,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Discard this message?"
 #~ msgstr "Zavrzi to sporoд█ilo"
 
-#~ msgid "Finish"
-#~ msgstr "Konд█aj"
-
 #~ msgid "Apply"
 #~ msgstr "Uporabi"
 
diff --git a/po/sv.po b/po/sv.po
index b6d7627b06..98dd075ff0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,12 +5,13 @@
 # Christian Rose <menthos@menthos.com>, 2000, 2001.
 # Martin NorbДck <d95mback@dtek.chalmers.se>, 2001.
 #
-# $Id: sv.po,v 1.103 2001/08/19 22:13:43 menthos Exp $
+# $Id: sv.po,v 1.104 2001/08/22 23:18:13 ettore Exp $
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-08-20 00:08+0200\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2001-08-20 00:12+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -325,7 +326,7 @@ msgstr "VCard fЖr %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/conduit/address-conduit.c:1100
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
@@ -341,20 +342,20 @@ msgstr "MarkЖren kunde inte lДsas in\n"
 msgid "EBook not loaded\n"
 msgstr "EBook inte inlДst\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Kunde inte starta wombat"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte lДsa pilotens adressprogramblock"
 
@@ -402,20 +403,34 @@ msgstr "Fabrik fЖr Evolutions adressbokskomponent."
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik fЖr adressbokstestkontrollen"
 
-#: addressbook/gui/component/addressbook-component.c:385
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Fel vid lДsning av filterinformation:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-component.c:386
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:385
+#: addressbook/gui/component/addressbook-component.c:386
 msgid "New _Contact"
 msgstr "Ny _kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:387
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:387
 msgid "New Contact _List"
 msgstr "Ny kontakt_lista"
 
@@ -525,12 +540,12 @@ msgstr "_Kontonamn:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:89 my-evolution/my-evolution.glade.h:18
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_LДgg till"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:94
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
@@ -554,28 +569,28 @@ msgstr "_Servernamn:"
 msgid "Other Contacts"
 msgstr "Andra kontakter"
 
-#: addressbook/gui/component/addressbook.c:378
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Ange din e-postadress och ditt lЖsenord fЖr Еtkomst till %s"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:394
 msgid "LDAP Authentication"
 msgstr "LDAP-autentisering"
 
-#: addressbook/gui/component/addressbook.c:397
+#: addressbook/gui/component/addressbook.c:405
 msgid "Email Address:"
 msgstr "E-postadress:"
 
-#: addressbook/gui/component/addressbook.c:410
+#: addressbook/gui/component/addressbook.c:418
 msgid "Password:"
 msgstr "LЖsenord:"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Kan inte Жppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -585,7 +600,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern Дr\n"
 "onЕbar"
 
-#: addressbook/gui/component/addressbook.c:485
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -597,7 +612,7 @@ msgstr ""
 "programmet frЕn CVS-kДllkod efter det att du har hДmtat\n"
 "OpenLDAP frЕn lДnken nedan.\n"
 
-#: addressbook/gui/component/addressbook.c:493
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -605,53 +620,64 @@ msgstr ""
 "Vi kunde inte Жppna denna adressbok. Kontrollera att sЖkvДgen\n"
 "existerar och att du har rДtt att komma Еt den."
 
-#: addressbook/gui/component/addressbook.c:634
+#: addressbook/gui/component/addressbook.c:642
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "NЕgot fДlt innehЕller"
 
-#: addressbook/gui/component/addressbook.c:635
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Namnet innehЕller"
 
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "E-postadressen innehЕller"
 
-#: addressbook/gui/component/addressbook.c:637
+#: addressbook/gui/component/addressbook.c:645
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategori Дr"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:638 widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avancerat..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:866
+#: addressbook/gui/component/addressbook.c:874
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Alla kategorier"
 
-#: addressbook/gui/component/addressbook.c:904
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappblДddraren kommer att visa"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Mer)"
+
 #: 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:1597
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "PrimДr e-post"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
 #: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "E-post 3"
@@ -674,19 +700,19 @@ msgstr "LДgg till adress till befintliga kontakten \"%s\""
 msgid "Querying Addressbook..."
 msgstr "UndersЖker adressboken..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Redigera kontaktinformation"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "LДgg till i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "SlЕ samman e-postadress"
 
@@ -707,7 +733,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabrik fЖr adressbokens namnvalsgrДnssnitt"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:661
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
 #: shell/e-shortcuts-view.c:385
@@ -726,11 +752,11 @@ msgstr "Skicka HTML-post?"
 msgid "Unnamed Contact"
 msgstr "NamnlЖs kontakt:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:430
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr "Kan inte fЕ tag i lokalt lagringsutrymme. Detta borde aldrig hДnda."
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names.c:560
 msgid "Select Contacts from Addressbook"
 msgstr "VДlj kontakter frЕn adressboken"
 
@@ -846,9 +872,9 @@ msgstr "_Kontakter..."
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1319 mail/mail-config.glade.h:93
-#: ui/evolution-mail-message.xml.h:88 ui/evolution-tasks.xml.h:12
-#: ui/evolution.xml.h:35
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -908,94 +934,99 @@ msgstr "Ta bort kontakten?"
 msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhЖr dessa kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1555
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
 #: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1556
-#: addressbook/gui/contact-editor/e-contact-editor.c:1623
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "FЖretag"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "FЖretag 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1558
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
 #: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "FЖretagsfax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1559
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Tillbakaringning"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1560
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "FЖretag"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
-#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Hem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Hem 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
 #: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Fax hem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
 #: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-#: addressbook/gui/contact-editor/e-contact-editor.c:1625
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Annat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
 #: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Annan fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
 #: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "PersonsЖkare"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "PrimДr"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
 #: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
 #: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "SnabbinlДggning av kontakt"
@@ -2286,7 +2317,7 @@ msgstr "Skriv ut kuvert"
 #: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -2301,8 +2332,8 @@ msgid "Success"
 msgstr "Lyckades"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1649
-#: shell/e-storage.c:503
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "OkДnt fel"
 
@@ -2310,7 +2341,7 @@ msgstr "OkДnt fel"
 msgid "Repository offline"
 msgstr "Lagret frЕnkopplat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "еtkomst nekas"
 
@@ -2879,7 +2910,7 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:601
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -2965,12 +2996,12 @@ msgid "Completed"
 msgstr "FДrdigt"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I.%M.%S %p"
 
@@ -3013,9 +3044,9 @@ msgstr "Odefinierad"
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1416
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1452
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
 #: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
@@ -3074,6 +3105,27 @@ msgstr "Kommentaren innehЕller"
 msgid "Unmatched"
 msgstr "Omatchad"
 
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Kalender"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Virtuell mapp pЕ sДndlista"
+
 #: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt mЖte"
@@ -3082,7 +3134,8 @@ msgstr "Skapa ett nytt mЖte"
 msgid "New _Appointment"
 msgstr "Nytt _mЖte"
 
-#: calendar/gui/component-factory.c:408 ui/evolution-tasks.xml.h:4
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
@@ -3094,23 +3147,23 @@ msgstr "Ny _uppgift"
 msgid "The URI that the calendar will display"
 msgstr "URI:n som kalendern kommer att visa"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr "Alternativ fЖr ljudalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr "Alternativ fЖr meddelandealarm"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr "Alternativ fЖr e-postalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr "Alternativ fЖr programalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr "Alternativ fЖr okДnda alarm"
 
@@ -3295,7 +3348,7 @@ msgstr "slut pЕ mЖte"
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:114
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -3353,22 +3406,23 @@ msgid "Friday"
 msgstr "fredag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Hide completed tasks after"
-msgstr "GЖm fДrdiga uppgifter efter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Hours"
 msgstr "timme"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "mЕndag"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Uppgifter som skulle ha utf_Жrts:"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
@@ -3439,7 +3493,7 @@ msgid "Wednesday"
 msgstr "onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Arbetsvecka"
 
@@ -3476,17 +3530,18 @@ msgid "_General"
 msgstr "Allm_Дnt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "GЖm fДrdiga uppgifter efter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
 msgstr "_mЕn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Other"
 msgstr "A_nnat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Overdue tasks:"
-msgstr "Uppgifter som skulle ha utf_Жrts:"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
 msgstr "_lЖr"
@@ -3585,41 +3640,35 @@ msgstr " (Ska utfЖras "
 msgid "Due "
 msgstr "Ska utfЖras "
 
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
-#: shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Redigera mЖte"
 
-#: calendar/gui/dialogs/comp-editor.c:464
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "MЖte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:467
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:484
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:854 mail/mail-callbacks.c:1489
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
 #: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Skriv Жver fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:858 mail/mail-callbacks.c:1495
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
 #: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
@@ -3628,12 +3677,12 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas Жver?"
 
-#: calendar/gui/dialogs/comp-editor.c:921 ui/evolution-comp-editor.xml.h:15
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr "Kunde inte fЕ tag i aktuell version!"
 
@@ -3922,7 +3971,7 @@ 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:84
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4155,7 +4204,7 @@ msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1284
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "_жppna"
 
@@ -4167,16 +4216,16 @@ msgstr "Klipp _ut"
 
 #: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
 #: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopiera"
 
 #: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
 #: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
 #: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail-list.xml.h:28
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "Klistra _in"
 
@@ -4237,8 +4286,11 @@ msgstr "Prioritet"
 msgid "Start Date"
 msgstr "Startdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-storage-set-view.c:1464
-#: shell/e-summary-storage.c:78
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Sammanfattning"
 
@@ -4286,7 +4338,7 @@ msgid "New All Day _Event"
 msgstr "Nytt _heldagsarrangemang"
 
 #: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "GЕ till _idag"
 
@@ -4463,18 +4515,6 @@ msgstr "Ledig/Upptagen-svar"
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig/upptagenmeddelande"
 
-#: calendar/gui/e-itip-control.c:786
-msgid "The message does not appear to be properly formed"
-msgstr "Meddelandet verkar inte vara korrekt utformat"
-
-#: calendar/gui/e-itip-control.c:805
-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:829
-msgid "The information contained in this attachment was not valid"
-msgstr "Informationen i denna bilaga var inte giltig"
-
 #: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "Jag kunde inte uppdatera din kalenderfil!\n"
@@ -4496,7 +4536,7 @@ msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
 #: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
-msgid "The item could not be send!\n"
+msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
@@ -4550,12 +4590,12 @@ msgstr "Metoden som krДvs fЖr att lДsa in \"%s\" stЖds inte"
 msgid "New _Appointment..."
 msgstr "Nytt _mЖte..."
 
-#: calendar/gui/gnome-cal.c:1258
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte Жppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1269
+#: calendar/gui/gnome-cal.c:1271
 #, 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"
@@ -4616,7 +4656,7 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr "En organisatЖr mЕste vara angiven."
 
@@ -4772,12 +4812,6 @@ msgstr "Fr"
 msgid "Sa"
 msgstr "LЖ"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-local-storage.c:180
-#: shell/e-shortcuts.c:1025 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Uppgifter"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -4811,9 +4845,8 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1898 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-comp-editor.xml.h:10
-#: ui/evolution-mail-message.xml.h:64
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "FЖrhandsgranska"
 
@@ -4946,8 +4979,8 @@ msgstr "contains? fЖrvДntar sig att argument 2 Дr en strДng"
 
 #: calendar/pcs/query.c:663
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? fЖrvДntar sig att argument 1 Дr ett av \"any\", \"summary\", eller "
 "\"description\""
@@ -4964,7 +4997,12 @@ msgstr ""
 "has-categories? fЖrvДntar sig att alla argument Дr strДngar eller att ett "
 "och endast ett argument Дr booleskt falsk (#f)"
 
-#: calendar/pcs/query.c:967
+#: calendar/pcs/query.c:805
+#, fuzzy
+msgid "is-completed? expects 0 arguments"
+msgstr "time-now fЖrvДntar sig 0 argument"
+
+#: calendar/pcs/query.c:1008
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluering av sЖkuttrycket gav inget booleskt vДrde"
 
@@ -5031,6 +5069,7 @@ msgid "Unable to process spool folder"
 msgstr "Kan inte bearbeta spool-mappen"
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "HДmtar meddelande %d (%d%%)"
 
@@ -5347,8 +5386,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Detta alternativ kommer att ansluta till servern med ett sДkert "
-"CRAM-MD5-lЖsenord, om servern stЖder det."
+"Detta alternativ kommer att ansluta till servern med ett sДkert CRAM-MD5-"
+"lЖsenord, om servern stЖder det."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -5359,8 +5398,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"Detta alternativ kommer att ansluta till servern med ett "
-"DIGEST-MD5-lЖsenord, om servern stЖder det."
+"Detta alternativ kommer att ansluta till servern med ett DIGEST-MD5-"
+"lЖsenord, om servern stЖder det."
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -5393,8 +5432,8 @@ msgstr "Kerberos 4"
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Detta alternativ kommer att ansluta till servern med Kerberos "
-"4-autentisering."
+"Detta alternativ kommer att ansluta till servern med Kerberos 4-"
+"autentisering."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -5425,7 +5464,7 @@ msgstr "OkДnt autentiseringstillstЕnd."
 
 #: 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:53
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "LЖsenord"
 
@@ -5690,7 +5729,7 @@ msgstr "Kontrollerar ny e-post"
 msgid "Check for new messages in all folders"
 msgstr "Kontrollerar nya meddelanden i alla mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:717
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Mappar"
 
@@ -5755,12 +5794,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:837 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1037
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "FЖrДldermappen fЕr inte innehЕlla undermappar"
 
@@ -6036,8 +6075,9 @@ msgstr "Kan inte sammanfatta mapp: %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:1549
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Synkroniserar mapp"
 
 #: camel/providers/local/camel-mbox-summary.c:507
@@ -6224,8 +6264,8 @@ msgstr "USENET-diskussionsgrupper"
 #: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
-"Det hДr Дr en leverantЖr fЖr lДsning och postning till "
-"USENET-diskussionsgrupper."
+"Det hДr Дr en leverantЖr fЖr lДsning och postning till USENET-"
+"diskussionsgrupper."
 
 #: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
@@ -6251,35 +6291,35 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kan inte Жppna eller skapa .newsrc-fil fЖr %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:190
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "HДmtar POP-sammanfattning"
 
-#: camel/providers/pop3/camel-pop3-folder.c:196
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Kunde inte kontrollera nya meddelanden pЕ POP-servern: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:236
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Kunde inte Жppna mapp: meddelandelistningen var inte komplett."
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Kunde inte hДmta meddelande: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kunde inte hДmta meddelande frЕn POP-servern %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Inget meddelande med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "HДmtar POP-meddelande %d"
@@ -6297,7 +6337,7 @@ msgstr "LДmna meddelanden pЕ servern"
 msgid "Delete after %s day(s)"
 msgstr "Ta bort efter %s dag(ar)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:52
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -6315,8 +6355,8 @@ msgid ""
 "is the only option supported by many POP servers."
 msgstr ""
 "Detta alternativ kommer att ansluta till POP-servern med ett "
-"klartextlЖsenord. Det hДr Дr det enda alternativet som stЖds hos mЕnga "
-"POP-servrar."
+"klartextlЖsenord. Det hДr Дr det enda alternativet som stЖds hos mЕnga POP-"
+"servrar."
 
 #: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
@@ -6392,7 +6432,7 @@ msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6446,7 +6486,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:64
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -6848,21 +6888,21 @@ msgstr "Spara som..."
 msgid "Warning!"
 msgstr "Varning!"
 
-#: composer/e-msg-composer.c:876
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "Filen finns, skriv Жver?"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inlДsning av filen: %s"
 
-#: composer/e-msg-composer.c:989
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -6870,16 +6910,16 @@ msgstr ""
 "Kan inte Жppna mallmappen fЖr detta konto.\n"
 "Vill du anvДnda standardmappen fЖr mallar?"
 
-#: composer/e-msg-composer.c:1042
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid Еtkomst av filen: %s"
 
-#: composer/e-msg-composer.c:1050
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hДmta meddelande frЕn redigeraren"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -6888,7 +6928,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1062
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -6897,7 +6937,7 @@ msgstr ""
 "Kan inte trunkera filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -6906,15 +6946,16 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1171
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution har hittat osparade filer frЕn en tidigare session.\n"
 "Vill du gЖra ett ЕterstДllningsfЖrsЖk?"
 
-#: composer/e-msg-composer.c:1319
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -6924,24 +6965,24 @@ msgstr ""
 "\n"
 "Vill du spara dina Дndringar?"
 
-#: composer/e-msg-composer.c:1326 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1349
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "жppna fil"
 
-#: composer/e-msg-composer.c:1498
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "Infoga fil"
 
-#: composer/e-msg-composer.c:1874 composer/e-msg-composer.c:2315
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2405
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa fЖnster fЖr meddelanderedigering."
 
@@ -7003,53 +7044,59 @@ msgstr "дmnesraden innehЕller inte"
 
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
 #: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1339
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
 #: widgets/misc/e-dateedit.c:1566
 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:1336
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
 #: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H.%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr "%d-%m-%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr "%Y-%m-%d"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr "%x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -7057,13 +7104,13 @@ msgstr "%a %Y-%m-%d"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:303
+#: e-util/e-time-utils.c:313
 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
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %Y-%m-%d %I.%M %p"
 
@@ -7203,7 +7250,7 @@ msgstr ""
 "GЕ tillbaka och ange en giltig mapp som e-post kan levereras till."
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:808
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "VДlj mapp"
 
@@ -7399,7 +7446,7 @@ msgstr "besvarad"
 msgid "Score"
 msgstr "PoДng"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1074
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "AvsДndare"
 
@@ -7521,13 +7568,13 @@ msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Hoppsan. Du mЕste ange minst en mapp som kДlla."
 
 #: 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/intelligent.c:194
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importera"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "E-post"
 
@@ -7555,11 +7602,11 @@ msgstr ""
 "Evolution har hittat GnomeCard-filer.\n"
 "Vill du importera dem till Evolution?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "InstДllningar"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7615,166 +7662,171 @@ msgstr "Fabrik fЖr e-postsammanfattningskomponenten."
 msgid "Mail configuration interface"
 msgstr "GrДnssnitt fЖr e-postkonfiguration"
 
-#: mail/component-factory.c:112
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Virtuell mapp pЕ sДndlista"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr "Denna mapp kan inte innehЕlla meddelanden."
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr "дndra egenskaperna fЖr denna mapp"
 
-#: mail/component-factory.c:739
+#: mail/component-factory.c:757
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/component-factory.c:739
+#: mail/component-factory.c:757
 msgid "New _Mail Message"
 msgstr "Nytt _e-postmeddelande"
 
-#: mail/component-factory.c:771
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:908
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser-ui.c:257
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper fЖr \"%s\""
 
-#: mail/folder-browser-ui.c:259
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:233 mail/mail-display.c:281
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunde inte skapa temporДr katalog: %s"
 
-#: mail/folder-browser.c:906
+#: mail/folder-browser.c:909
 msgid "Create vFolder from Search"
 msgstr "Skapa virtuell mapp frЕn sЖkning"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp pЕ _Дmnesrad"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp pЕ _avsДndare"
 
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp pЕ _mottagare"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp pЕ sДnd_lista"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Filtrera pЕ _Дmnesrad"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Filtrera pЕ _avsДndare"
 
-#: mail/folder-browser.c:1272
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Filtrera pЕ _mottagare"
 
-#: mail/folder-browser.c:1275
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Filtrera pЕ sД_ndlista"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: mail/folder-browser.c:1290
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsДndaren"
 
-#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/folder-browser.c:1299 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/folder-browser.c:1301
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/folder-browser.c:1304 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "_Markera som lДst"
 
-#: mail/folder-browser.c:1306 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Markera som _olДst"
 
-#: mail/folder-browser.c:1308
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/folder-browser.c:1310
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr "Markera som ovikti_gt"
 
-#: mail/folder-browser.c:1315
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: mail/folder-browser.c:1317
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1321 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_еngra borttagning"
 
-#: mail/folder-browser.c:1326
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "LДgg till avsДndaren i adressboken"
 
-#: mail/folder-browser.c:1331
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "TillДmpa filter"
 
-#: mail/folder-browser.c:1335
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "Skapa rege_l frЕn meddelande"
 
-#: mail/folder-browser.c:1493
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filtrera pЕ sДndlista"
 
-#: mail/folder-browser.c:1494
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "Virtuell mapp pЕ sДndlista"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera pЕ sДndlista (%s)"
 
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Virtuell mapp pЕ sДndlista (%s)"
@@ -7843,15 +7895,15 @@ msgid "Evolution News Editor"
 msgstr "Evolutions diskussionsgruppsredigerare"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-gui.c:998
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "Spara signatur"
 
-#: mail/mail-account-gui.c:1004
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -7861,6 +7913,10 @@ msgstr ""
 "\n"
 "Vill du spara dina Дndringar?"
 
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
 #: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (standard)"
@@ -7885,12 +7941,12 @@ msgstr "Ta inte bort"
 msgid "Really delete account?"
 msgstr "Verkligen ta bort kontot?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "дr du sДker pЕ att du vill ta bort detta diskussionsgruppskonto?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:41
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "E-postinstДllningar"
 
@@ -7982,24 +8038,24 @@ msgstr "Du mЕste konfigurera ett konto innan du kan skicka brevet."
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a %Y-%m-%d klockan %H.%M skrev %%s:"
 
-#: mail/mail-callbacks.c:894
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Vidarebefordrat meddelande:\n"
 
-#: mail/mail-callbacks.c:994
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:996
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:1365
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "дr du sДker pЕ att du vill redigera alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:1387
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8007,7 +8063,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Drafts."
 
-#: mail/mail-callbacks.c:1421
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8015,28 +8071,28 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Sent."
 
-#: mail/mail-callbacks.c:1433
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "дr du sДker pЕ att du vill skicka om alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:1454
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "Inget meddelande markerat"
 
-#: mail/mail-callbacks.c:1539
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:1541
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:1686 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varning"
 
-#: mail/mail-callbacks.c:1691
+#: mail/mail-callbacks.c:1714
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8049,11 +8105,11 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/mail-callbacks.c:1698
+#: mail/mail-callbacks.c:1721
 msgid "Do not ask me again."
 msgstr "FrЕga mig inte igen."
 
-#: mail/mail-callbacks.c:1803
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8062,61 +8118,71 @@ msgstr ""
 "Fel vid lДsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1813
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:1859
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:1905
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-callbacks.c:1989
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "дr du sДker pЕ att du vill Жppna alla %d meddelanden i separata fЖnster?"
 
 #: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "Ange ditt namn och din e-postadress nedan. De \"valfria\" fДlten nedan "
 "behЖver du inte fylla i sЕvida du inte vill inkludera denna information i "
 "den e-post som du skickar."
 
 #: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Ange information om din server fЖr inkommande e-post nedan. Om du inte vet "
 "vad fЖr server du anvДnder kan du kontakta din systemadministratЖr eller din "
 "InternetleverantЖr."
 
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
 #: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Ange information om din server fЖr utgЕende e-post nedan. Om du inte vet vad "
 "fЖr protokoll du anvДnder kan du kontakta din systemadministratЖr eller "
 "InternetleverantЖr."
 
 #: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "Du Дr nДstan fДrdig med din e-postkonfiguration. Identiteten, den inkommande "
 "e-postservern och transportmetoden fЖr utgЕende e-post som du angav kommer "
@@ -8124,7 +8190,7 @@ msgstr ""
 "detta konto nedan. Detta namn kommer endast att anvДndas fЖr visning."
 
 #. set window title
-#: mail/mail-config-druid.c:622
+#: mail/mail-config-druid.c:558
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
@@ -8133,16 +8199,16 @@ msgstr "Evolutions kontoassistent"
 #. * name. I don't think this will work with maildir. How can we figure out
 #. * what shortcut to insert?
 #.
-#: mail/mail-config.c:1577
+#: mail/mail-config.c:1579
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Inkorg"
 
-#: mail/mail-config.c:1807
+#: mail/mail-config.c:1809
 msgid "Checking Service"
 msgstr "Kontrollerar tjДnst"
 
-#: mail/mail-config.c:1878 mail/mail-config.c:1881
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
@@ -8253,196 +8319,202 @@ msgstr "Mallmapp:"
 msgid "E_nable"
 msgstr "Sl_Е pЕ"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Spara aktuell fil med ett annat namn"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "PЕslagen"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "HДmta digitalt ID..."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "HTML-signaturfil:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "I HTML-brev"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Inuti"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "BrevlЕdeplats"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "GЖr detta till mitt standard_konto"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr "_MeddelandefЖrhandsgranskningen ska visas som standard"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr "Meddelandelistan ska visas pЕ ett _trЕdat vis som standard"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "NNTP-server:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "PGP-nyckelid:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "VДlj en fДrg"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "FrЕga dЕ meddelanden skickas med en t_om Дmnesrad"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "FrЕga dЕ meddelanden skickas med endast _blindkopiemottagare angivna"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "Citerad"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Mottagande av post"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Alternativ fЖr mottagning"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Obligatorisk information"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "SДker MIME"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "SДkerhet"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "VДlj en filterloggfil..."
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "VДlj PGP-program"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Skickande av post"
 
-#: mail/mail-config.glade.h:72 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Skickat"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Skickade meddelanden och mallar"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Mapp fЖr skickade meddelanden:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
 msgstr "Servern krДver _autentisering"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "KДllkod"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "KДllinformation"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "KДllor"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Specialmappar"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlЕda"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr "AnvДnd sДker anslutning (_SSL)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8452,104 +8524,104 @@ msgstr ""
 "\n"
 "Klicka pЕ \"NДsta\" fЖr att bЖrja. "
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "LДs _alltid in bilder frЕn nДtet"
 
 # LЕter konstigt
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
 msgstr "Kontrollera _automatiskt ny e-post var"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
 msgstr "Kontrollera vilka _typer som stЖds"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
 msgstr "_E-postadress:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
 msgstr "_TЖm papperskorgsmappar vid avslut"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Full Name:"
 msgstr "_FullstДndigt namn:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr "_Markera citat med"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
 msgstr "_VДrd:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
 msgstr "_LДs in bilder om avsДndaren finns i adressboken"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr "_Logga filterЕtgДrder i:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
 msgstr "_Markera meddelanden som lДsta efter"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr "LДs _aldrig in bilder frЕn nДtet"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Organization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr "SЖkvДg till _PGP-programmet:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "_SЖkvДg:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr "_Kom ihЕg GPG-lЖsenordsfrasen fram till avslut"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Kom ihЕg detta lЖsenord"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "_Skicka brev i HTML-format som standard."
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "_Signaturfil:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "AnvДndar_namn:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr "platshЕllare"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "sekunder."
 
@@ -8755,17 +8827,22 @@ msgstr "Pekare till okДnd extern data (typen \"%s\")"
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/mail-local.c:466
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Det finns ingen mapp %s"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "жppnar \"%s\""
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Byter format pЕ mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -8774,7 +8851,7 @@ msgstr ""
 "Kan inte spara metadata fЖr mapp; du kommer antagligen att\n"
 "upptДcka att du inte kan Жppna denna mapp lДngre: %s"
 
-#: mail/mail-local.c:914
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -8782,11 +8859,11 @@ msgstr ""
 "Om du inte lДngre kan Жppna denna brevlЕda mЕste\n"
 "du kanske reparera den manuellt."
 
-#: mail/mail-local.c:1007
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan inte Дndra formatet pЕ en ickelokal mapp."
 
-#: mail/mail-local.c:1018
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Konfigura om %s"
@@ -8841,7 +8918,7 @@ msgstr "Skickar meddelande %d av %d"
 msgid "Failed on message %d of %d"
 msgstr "Meddelande %d av %d misslyckades"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "FДrdig."
 
@@ -8881,7 +8958,7 @@ msgstr "Papperskorg"
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "жppnar mappen %s"
@@ -8891,35 +8968,45 @@ msgstr "жppnar mappen %s"
 msgid "Opening store %s"
 msgstr "жppnar lagringsutrymmet %s"
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Skapar ny mapp"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn pЕ mappen %s"
 
-#: mail/mail-ops.c:1599
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synkronisera \"%s\""
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "TЖmmer mapp"
 
-#: mail/mail-ops.c:1684
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "HДmtar meddelande %s"
 
-#: mail/mail-ops.c:1751
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "HДmtar %d meddelande(n)"
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Sparar %d meddelande(n)"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -8928,7 +9015,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -8937,11 +9024,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -8950,12 +9037,12 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar frЕn %s"
@@ -9012,7 +9099,7 @@ msgstr "Uppdaterar..."
 msgid "Waiting..."
 msgstr "VДntar..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Avbruten."
 
@@ -9038,11 +9125,11 @@ msgstr "Vidarebefordrat meddelande"
 msgid "Forwarded Message"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/mail-vfolder.c:282
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
@@ -9111,7 +9198,7 @@ msgstr "%a %H.%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2314
+#: mail/message-list.c:2312
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -9127,36 +9214,36 @@ msgstr "Mottaget"
 msgid "Size"
 msgstr "Storlek"
 
-#: mail/subscribe-dialog.c:167
+#: mail/subscribe-dialog.c:174
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "GenomsЖker mappar under %s pЕ \"%s\""
 
-#: mail/subscribe-dialog.c:169
+#: mail/subscribe-dialog.c:176
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "GenomsЖker mappar pЕ rotnivЕ pЕ \"%s\""
 
-#: mail/subscribe-dialog.c:268
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prenumererar pЕ mappen \"%s\""
 
-#: mail/subscribe-dialog.c:270
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "SДger upp prenumeration pЕ mappen \"%s\""
 
-#: mail/subscribe-dialog.c:1241 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mapp"
 
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1490
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: mail/subscribe-dialog.c:1540
+#: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
 msgstr "VДlj en server."
 
@@ -9200,6 +9287,10 @@ msgstr "Evolutionkomponent fЖr sammanfattningen."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Fabrik fЖr Evolutions sammanfattningskomponent."
 
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
 #: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Kan inte initiera Evolutions sammanfattningskomponent."
@@ -9220,7 +9311,7 @@ msgstr "%H.%M"
 msgid "%a %l:%M%p"
 msgstr "%a %H.%M"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
@@ -9229,7 +9320,7 @@ msgstr "E-postsammanfattning"
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
 #: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:602
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS:ZSAM:EGAA"
 msgstr "ESGG:ESMS:ESSA:ESNU"
 
@@ -9269,8 +9360,9 @@ msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fel vid hДmtning av RDF</b>"
 
 #: my-evolution/e-summary-rdf.c:479
-msgid "RDF Summary"
-msgstr "RDF-sammanfattning"
+#, fuzzy
+msgid "News Feed"
+msgstr "_NyhetskДllor"
 
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
@@ -9288,7 +9380,7 @@ msgstr "<dd><b>VДderservern kunde inte kontaktas</b></dd>"
 msgid "Weather"
 msgstr "VДder"
 
-#: my-evolution/e-summary-weather.c:663
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Regioner"
 
@@ -9308,6 +9400,42 @@ msgstr "Utskrift av sammanfattning misslyckades"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Sammanfattningskomponenten kunde inte initiera Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Typsnitt"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Flyttar"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Fil"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "Filter"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Klar himmel"
@@ -10479,11 +10607,6 @@ msgstr "Alla _mappar:"
 msgid "All news _feeds:"
 msgstr "Alla nyhets_kДllor:"
 
-#: my-evolution/my-evolution.glade.h:6 shell/e-local-storage.c:174
-#: shell/e-shortcuts.c:1024
-msgid "Calendar"
-msgstr "Kalender"
-
 #: my-evolution/my-evolution.glade.h:7
 msgid "How many days should the calendar display at once?"
 msgstr "Hur mЕnga dagar ska kalendern visa samtidigt?"
@@ -10592,9 +10715,7 @@ msgstr "Visa detaljer"
 msgid "Cancel Operation"
 msgstr "Avbryt ЕtgДrd"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1023
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
 msgid "Inbox"
 msgstr "Inkorg"
 
@@ -10602,7 +10723,7 @@ msgstr "Inkorg"
 msgid "Outbox"
 msgstr "Utkorg"
 
-#: shell/e-local-storage.c:592
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
@@ -10704,25 +10825,25 @@ msgstr "Kan inte kopiera en mapp tillsig sjДlv."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan inte flytta en mapp till en av dess undermappar."
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Ange en mapp att kopiera mappen \"%s\" till:"
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Kopieringsmapp"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Ange en mapp att flytta mappen \"%s\" till:"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Flyttningsmapp"
 
-#: shell/e-shell-folder-commands.c:357
+#: shell/e-shell-folder-commands.c:358
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -10731,30 +10852,30 @@ msgstr ""
 "Kan inte ta bort mapp:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Ta bort mappen \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "дr du sДker pЕ att du vill ta bort mappen \"%s\"?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:458
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Byt namn pЕ mappen \"%s\""
 
-#: shell/e-shell-folder-commands.c:462 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Byt namn"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:470
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappnamn:"
@@ -10788,7 +10909,7 @@ msgstr ""
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:569 shell/e-shell-folder-title-bar.c:570
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(NamnlЖs)"
 
@@ -10828,7 +10949,7 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -10885,11 +11006,11 @@ msgstr "VДlj en fil"
 msgid "File type:"
 msgstr "Filtyp:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "VДlj mapp"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr "VДlj en destinationsmapp fЖr importen av denna data"
 
@@ -10897,7 +11018,19 @@ msgstr "VДlj en destinationsmapp fЖr importen av denna data"
 msgid "Closing connections..."
 msgstr "Kopplar frЕn anslutningar..."
 
-#: shell/e-shell-startup-wizard.c:536
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Kan inte initiera Evolutionskalet: %s"
+
+#: shell/e-shell-startup-wizard.c:558
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -10905,7 +11038,7 @@ msgstr ""
 "Var god vДnta...\n"
 "Letar efter befintliga konfigurationer"
 
-#: shell/e-shell-startup-wizard.c:539
+#: shell/e-shell-startup-wizard.c:561
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligenta importЖrer"
 
@@ -10960,36 +11093,36 @@ msgstr "Arbeta frЕnkopplad"
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:1457
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1497
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution Дr just nu ansluten. Klicka pЕ denna knapp fЖr att koppla frЕn."
 
-#: shell/e-shell-view.c:1504
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution hЕller pЕ att koppla frЕn."
 
-#: shell/e-shell-view.c:1510
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution Дr just nu frЕnkopplad. Klicka pЕ denna knapp fЖr att ansluta."
 
-#: shell/e-shell.c:508
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan inte lДgga upp lokal plats fЖr sparande -- %s"
 
-#: shell/e-shell.c:1435
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -10998,23 +11131,23 @@ msgstr ""
 "Hoppsan! Vyerna fЖr \"%s\" dog ovДntat. :-(\n"
 "Det hДr betyder antagligen att komponenten %s har kraschat."
 
-#: shell/e-shell.c:1639 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1641
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:1643
+#: shell/e-shell.c:1646
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera pЕ OAF"
 
-#: shell/e-shell.c:1645
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:1647 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "AllmДnt fel"
 
@@ -11123,11 +11256,11 @@ msgstr "Byt namn pЕ denna genvДg"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Ta bort denna genvДg frЕn genvДgsraden"
 
-#: shell/e-shortcuts.c:620
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Fel vid sparande av genvДgar."
 
-#: shell/e-shortcuts.c:1019
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr "GenvДgar"
 
@@ -11135,52 +11268,58 @@ msgstr "GenvДgar"
 msgid "(No name)"
 msgstr "(Inget namn)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Inga fel"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "En mapp med samma namn finns redan"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Den angivna mapptypen Дr inte giltig"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "I/O-fel"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Inte tillrДckligt med utrymme fЖr att skapa mapp"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Den angivna mappen hittades inte"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Funktionen Дr Дnnu inte implementerad i detta lager"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "еtgДrden stЖds inte"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivna typen stЖds inte i detta lager"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:511
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den angivna mappen kan inte Дndras eller tas bort"
 
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Kan inte flytta en mapp till en av dess undermappar."
+
 #: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fДrdigt)"
 
@@ -11315,6 +11454,7 @@ msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopiera"
 
@@ -11330,11 +11470,11 @@ msgstr "Skapa ny kontakt"
 msgid "Create new contact list"
 msgstr "Skapa ny kontaktlista"
 
-#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:9
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
@@ -11346,11 +11486,11 @@ msgstr "Ta bort markerade kontakter"
 msgid "New List"
 msgstr "Ny lista"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Klistra in"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:21
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Klistra in frЕn urklipp"
 
@@ -11398,8 +11538,8 @@ msgstr "Stopp"
 msgid "Stop Loading"
 msgstr "Stoppa inlДsning"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
@@ -11423,7 +11563,7 @@ msgstr "_Kontaktlista"
 msgid "_Forward Contact..."
 msgstr "_Vidarebefordra kontakt..."
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:37
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
@@ -11441,9 +11581,9 @@ msgstr "_SЖk efter kontakter"
 msgid "_Select All"
 msgstr "_Markera allt"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:40
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
 #: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:15
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Verktyg"
@@ -11453,7 +11593,8 @@ msgid "Configure the calendar's settings"
 msgstr "Konfigurera kalenderns instДllningar"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All-Day _Event"
+#, fuzzy
+msgid "Create a New All Day _Event"
 msgstr "Skapa ett nytt _heldagsevenemang"
 
 #: ui/evolution-calendar.xml.h:5
@@ -11464,99 +11605,104 @@ msgstr "Skapa en ny _uppgift"
 msgid "Create a _New Appointment"
 msgstr "Skapa ett _nytt mЖte"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "Skapa en hДndelse som varar en hel dag"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:11 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Ta bort detta mЖte"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "GЕ till"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back"
 msgstr "GЕ bakЕt"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward"
 msgstr "GЕ framЕt"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "GЕ till _datum"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "GЕ till ett specifikt datum"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to today"
 msgstr "GЕ till idag"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "MЕnad"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nytt mЖte"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-tasks.xml.h:8
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "FЖrhandsgranskar kalendern som ska skrivas ut"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
 msgstr "FЖrhands_granska"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicera ledig-/upptageninformation fЖr denna kalender"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Visa en dag"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Visa en mЕnad"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Visa en vecka"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show work week"
-msgstr "Visa arbetsvecka"
+#: ui/evolution-calendar.xml.h:31
+msgid "Show the working week"
+msgstr "Visa arbetsveckan"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Vecka"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "_MЖte..."
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "_KalenderinstДllningar..."
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:41
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicera ledig-/upptageninformation"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:42
 msgid "_Task..."
 msgstr "_Uppgift..."
 
@@ -11585,42 +11731,34 @@ msgstr "Huvudverktygsrad"
 msgid "Preview the printed item"
 msgstr "FЖrhandsgranska det utskrivna objektet"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print S_etup"
-msgstr "Skrivar_instДllningar"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Skriv ut detta objekt"
 
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
 msgid "Save"
 msgstr "Spara"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Spara och stДng"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Spara objektet och stДng dialogrutan"
 
-#: ui/evolution-comp-editor.xml.h:18
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Spara detta objekt till disk"
 
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-mail-message.xml.h:73
-msgid "Setup the page settings for your current printer"
-msgstr "StДll in sidinstДllningarna fЖr din aktuella skrivare"
-
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
@@ -12161,6 +12299,10 @@ msgstr "Spara meddelandet som en textfil"
 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:73
+msgid "Setup the page settings for your current printer"
+msgstr "StДll in sidinstДllningarna fЖr din aktuella skrivare"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Visa e-post_kДllkod"
@@ -12496,27 +12638,28 @@ msgstr "Upp_datera uppgift"
 msgid "Configure the task view's settings"
 msgstr "Konfigurera uppgiftsvyns instДllningar"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "Kopiera markerad uppgift"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "Klipp ut markerad uppgift"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "Ta bort markerade uppgifter"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Klistra in uppgift frЕn urklipp"
 
-#: ui/evolution-tasks.xml.h:10
-msgid "Tasks Settings"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings..."
 msgstr "UppgiftsinstДllningar"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_Uppgift"
 
@@ -12938,6 +13081,16 @@ msgstr "SЖkredigerare"
 msgid "Save Search"
 msgstr "Spara sЖkning"
 
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Spara sЖkning"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "_TЖm"
+
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Visa alla"
@@ -12991,9 +13144,27 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
-#~ msgid "The item could not be sent!\n"
+#~ msgid "RDF Summary"
+#~ msgstr "RDF-sammanfattning"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Meddelandet verkar inte vara korrekt utformat"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Meddelandet innehЕller typer av begДran som inte stЖds."
+
+#~ msgid "The information contained in this attachment was not valid"
+#~ msgstr "Informationen i denna bilaga var inte giltig"
+
+#~ msgid "The item could not be send!\n"
 #~ msgstr "Objektet kunde inte skickas!\n"
 
+#~ msgid "Show work week"
+#~ msgstr "Visa arbetsvecka"
+
+#~ msgid "Print S_etup"
+#~ msgstr "Skrivar_instДllningar"
+
 #~ msgid "On %s, %s wrote:"
 #~ msgstr "Den %s skrev %s:"
 
@@ -13093,9 +13264,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Print this Calendar"
 #~ msgstr "Skriv ut denna kalender"
 
-#~ msgid "Show the working week"
-#~ msgstr "Visa arbetsveckan"
-
 #~ msgid "W_ork Week"
 #~ msgstr "_Arbetsvecka"
 
@@ -13111,9 +13279,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Close this appointment"
 #~ msgstr "StДng detta mЖte"
 
-#~ msgid "Delete this appointment"
-#~ msgstr "Ta bort detta mЖte"
-
 #~ msgid "Save the appointment and close the dialog box"
 #~ msgstr "Spara mЖtet och stДng dialogrutan"
 
@@ -13261,9 +13426,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "LDAP Server"
 #~ msgstr "LDAP-server"
 
-#~ msgid "File"
-#~ msgstr "Fil"
-
 #~ msgid "Unknown addressbook type"
 #~ msgstr "OkДnd adressbokstyp"
 
@@ -13316,11 +13478,11 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Skapa sЖkvДgen om den inte finns."
 
 #~ msgid ""
-#~ "Select the kind of addressbook you have, and enter the relevant information "
-#~ "about it."
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
 #~ msgstr ""
-#~ "Markera den typ av adressbok du har och ange den relevanta informationen om "
-#~ "den."
+#~ "Markera den typ av adressbok du har och ange den relevanta informationen "
+#~ "om den."
 
 #~ msgid "FIXME Name help text here"
 #~ msgstr "FIXME NamnhjДlptext hДr"
@@ -13442,11 +13604,11 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Vidarebefordrat meddelande (inget Дmne)"
 
 #~ 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 ""
-#~ "-----Vidarebefordrat meddelande-----<br><b>Fr&aring;n:</b> "
-#~ "%s<br><b>Till:</b> %s<br><b>&Auml;mne:</b> %s<br>"
+#~ "-----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"
@@ -13505,9 +13667,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Insert text file..."
 #~ msgstr "_Infoga textfil..."
 
-#~ msgid "(More)"
-#~ msgstr "(Mer)"
-
 #~ msgid "Mar_k As Read"
 #~ msgstr "Mar_kera som lДst"
 
@@ -13532,9 +13691,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "Byter namn pЕ gammal mapp och Жppnar"
 
-#~ msgid "Creating new folder"
-#~ msgstr "Skapar ny mapp"
-
 #~ msgid "Copying messages"
 #~ msgstr "Kopierar meddelanden"
 
@@ -14004,9 +14160,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "Adress_bok... (FIXME)"
 
-#~ msgid "C_lear"
-#~ msgstr "_TЖm"
-
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "_Kontrollera namn (FIXME)"
 
@@ -14256,7 +14409,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr ""
-#~ "Vidarebefordra detta meddelande inuti ditt brev, sЕ att du kan redigera det"
+#~ "Vidarebefordra detta meddelande inuti ditt brev, sЕ att du kan redigera "
+#~ "det"
 
 #~ msgid "Invert Selection"
 #~ msgstr "OmvДnd markering"
@@ -14367,11 +14521,11 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "VANLIG"
 
 #~ 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 ""
-#~ "Detta alternativ kommer att ansluta till servern med en VANLIG SASL-mekanism "
-#~ "om servern stЖder det."
+#~ "Detta alternativ kommer att ansluta till servern med en VANLIG SASL-"
+#~ "mekanism om servern stЖder det."
 
 #~ msgid "No such host %s."
 #~ msgstr "Det finns ingen vДrd med namnet %s."
@@ -14396,20 +14550,20 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "SДker 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 ""
-#~ "FЖr anslutning till POP-servrar Жver en SSL-anslutning. POP-protokollet kan "
-#~ "Дven anvДndas fЖr att hДmta e-post frЕn vissa webb-epostleverantЖrer och "
-#~ "slutna e-postsystem."
+#~ "FЖr anslutning till POP-servrar Жver en SSL-anslutning. POP-protokollet "
+#~ "kan Дven anvДndas fЖr att hДmta e-post frЕn vissa webb-epostleverantЖrer "
+#~ "och slutna e-postsystem."
 
 #~ 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 ""
-#~ "FЖr leverans av e-post genom anslutning till ett fjДrr-epostnav som anvДnder "
-#~ "SMTP Жver en SSL-anslutning.\n"
+#~ "FЖr leverans av e-post genom anslutning till ett fjДrr-epostnav som "
+#~ "anvДnder SMTP Жver en SSL-anslutning.\n"
 
 #~ msgid "Remove action"
 #~ msgstr "Ta bort ЕtgДrd"
@@ -14501,7 +14655,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "authentication. This should be fine for connecting to most SMTP servers."
 #~ msgstr ""
 #~ "Detta alternativ kommer att ansluta till SMTP-servern utan nЕgon form av "
-#~ "autentisering. Detta bЖr fungera fЖr anslutning till de flesta SMTP-servrar."
+#~ "autentisering. Detta bЖr fungera fЖr anslutning till de flesta SMTP-"
+#~ "servrar."
 
 #~ msgid "[ %s ]"
 #~ msgstr "[ %s ]"
@@ -14662,7 +14817,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
 #~ msgid "Note: When converting between mailbox formats, a failure\n"
 #~ msgstr ""
-#~ "Observera: Vid konvertering mellan brevlЕdeformat kommer ett misslyckande\n"
+#~ "Observera: Vid konvertering mellan brevlЕdeformat kommer ett "
+#~ "misslyckande\n"
 
 #~ msgid "Connect to server"
 #~ msgstr "Anslut till server"
@@ -14860,8 +15016,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid ""
 #~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
 #~ msgstr ""
-#~ "Kunde inte lДsa UID-cachefilen \"%s\". Du kommer kanske att fЕ dubbla kopior "
-#~ "av meddelanden."
+#~ "Kunde inte lДsa UID-cachefilen \"%s\". Du kommer kanske att fЕ dubbla "
+#~ "kopior av meddelanden."
 
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "HДmtar meddelande %d av %d"
@@ -14882,8 +15038,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
 #~ msgstr ""
-#~ "FЖr lДsning av e-post som levereras av det lokala systemet och som lagras pЕ "
-#~ "lokal disk."
+#~ "FЖr lДsning av e-post som levereras av det lokala systemet och som lagras "
+#~ "pЕ lokal disk."
 
 #~ msgid "Create a new note"
 #~ msgstr "Skapa en ny anteckning"
@@ -14925,12 +15081,13 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Svara till:"
 
 #~ 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 ""
-#~ "Ange ditt namn och din e-postadress fЖr utgЕende post. Du kan ocksЕ, om du "
-#~ "vill, ange namnet pЕ din organisation och en fil att lДsa din signatur frЕn."
+#~ "Ange ditt namn och din e-postadress fЖr utgЕende post. Du kan ocksЕ, om "
+#~ "du vill, ange namnet pЕ din organisation och en fil att lДsa din signatur "
+#~ "frЕn."
 
 #~ msgid "Full name:"
 #~ msgstr "FullstДndigt namn:"
@@ -14942,24 +15099,24 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Typ av e-postkДlla:"
 
 #~ 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 ""
-#~ "VДlj den typ av e-postserver som du har och ange den relevanta informationen "
-#~ "om den.\n"
+#~ "VДlj den typ av e-postserver som du har och ange den relevanta "
+#~ "informationen om den.\n"
 #~ "\n"
-#~ "Om servern krДver autentisering kan du klicka pЕ knappen \"Detektera vilka "
-#~ "typer som stЖds...\" nДr du har angett den andra informationen."
+#~ "Om servern krДver autentisering kan du klicka pЕ knappen \"Detektera "
+#~ "vilka typer som stЖds...\" nДr du har angett den andra informationen."
 
 #~ 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 ""
 #~ "VДlj den typ av diskussionsgruppsserver som du har och ange den relevanta "
 #~ "informationen om den.\n"
@@ -15079,7 +15236,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Vidarebefordra meddelande \"%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 ""
 #~ "Misslyckades med att generera mime-del frЕn meddelande nДr ett "
 #~ "vidarebefordrat meddelande skulle genereras."
@@ -15090,9 +15248,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Load \"%s\""
 #~ msgstr "LДs in \"%s\""
 
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Synkronisera \"%s\""
-
 #~ msgid "Displaying message UID \"%s\""
 #~ msgstr "Visar meddelande-UID \"%s\""
 
diff --git a/po/tr.po b/po/tr.po
index fe68ceaa21..63ea28e89e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,10 +1,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Fatih Demir <kabalak@gmx.net>, 2000.
 # 
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -20,11 +21,11 @@ msgstr "VCard dosyalarЩnЩ Evolution'a aktarЩm mimarisi."
 msgid "Imports VCard files into Evolution."
 msgstr "VCard dosyalarЩnЩ Evolution'a aktarЩr."
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Kart: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -32,7 +33,7 @@ msgstr ""
 "\n"
 "щsim: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -40,7 +41,7 @@ msgstr ""
 "\n"
 "  жnek:     "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -48,7 +49,7 @@ msgstr ""
 "\n"
 "  Verilen:      "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -56,7 +57,7 @@ msgstr ""
 "\n"
 "  Ek: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -64,7 +65,7 @@ msgstr ""
 "\n"
 "  Aile:     "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -72,7 +73,7 @@ msgstr ""
 "\n"
 "  Sonek:     "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -80,7 +81,7 @@ msgstr ""
 "\n"
 "DoПum GЭnЭ: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -88,7 +89,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -96,7 +97,7 @@ msgstr ""
 "\n"
 "  Posta Kutusu:  "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -104,7 +105,7 @@ msgstr ""
 "\n"
 "  DiПer:         "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -112,7 +113,7 @@ msgstr ""
 "\n"
 "  Cadde:      "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -120,7 +121,7 @@ msgstr ""
 "\n"
 "  чehir:        "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -128,7 +129,7 @@ msgstr ""
 "\n"
 "  BЖlge:      "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -136,7 +137,7 @@ msgstr ""
 "\n"
 "  Posta Kodu: "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -144,13 +145,13 @@ msgstr ""
 "\n"
 "  эlke:     "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -158,7 +159,7 @@ msgstr ""
 "\n"
 "Telefonlar:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -166,7 +167,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -174,7 +175,7 @@ msgstr ""
 "\n"
 "E-posta:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -182,7 +183,7 @@ msgstr ""
 "\n"
 "E-posta:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -190,7 +191,7 @@ msgstr ""
 "\n"
 "PostalayЩcЩ: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -198,7 +199,7 @@ msgstr ""
 "\n"
 "Zaman Dilimi: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -206,7 +207,7 @@ msgstr ""
 "\n"
 "CoПrafi Konum: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -214,7 +215,7 @@ msgstr ""
 "\n"
 "Meslek: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -222,7 +223,7 @@ msgstr ""
 "\n"
 "Kurum: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -230,7 +231,7 @@ msgstr ""
 "\n"
 "  щsim:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -238,7 +239,7 @@ msgstr ""
 "\n"
 "  эnite:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -246,7 +247,7 @@ msgstr ""
 "\n"
 "  эnite2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -254,7 +255,7 @@ msgstr ""
 "\n"
 "  эnite3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -262,7 +263,7 @@ msgstr ""
 "\n"
 "  эnite5: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -270,7 +271,7 @@ msgstr ""
 "\n"
 "SЩnЩflar: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -288,7 +289,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -296,7 +297,7 @@ msgstr ""
 "\n"
 "жzel Dizi: "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -317,8 +318,8 @@ msgstr "%s iГin VCard"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -333,20 +334,20 @@ msgstr "щmleГ yЭklenemedi\n"
 msgid "EBook not loaded\n"
 msgstr "EBook yЭklenmedi\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Wombat baЧlatЩlamadЩ"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot adres uygulama defteri okunamadЩ"
 
@@ -394,194 +395,206 @@ msgstr "Evolution adres defteri bileЧen mimarisi"
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "_BaПlantЩ"
 
-#: 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-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Filtre bilgisini yЭklerken hata oluЧtu:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Bilinmeyen kimlik denetim tЭrЭ"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Yeni BaПlantЩ:"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Temel"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Yeni BaПlantЩ:"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Biri"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Yeni BaПlantЩ:"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Alt AПaГ"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Yeni BaПlantЩ:"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Bilinmeyen saha tЭrЭ"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Adres Defterini DЭzenle"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "BaПlantЩ DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr ""
 
-#: 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.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Hesap"
 
-#. 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.glade.h:3
+msgid "Add Addressbook"
+msgstr "Adres Defterine Ekle"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "Makina:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Adres Defteri KaynaklarЩ"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "Makine yardЩm metni"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "GeliЧmiЧ..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "KЖk DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Temel"
 
-#: 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.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Temel"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Port:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "Port yardЩm metni"
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "Biri"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 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.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Arama SahasЩ:"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "Yol yardЩm metni"
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "щsimleri SeГin"
 
-#: 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.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Pz"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "Adres Defterini DЭzenle"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "Adres Defterine Ekle"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 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:"
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
-msgstr "щsim yardЩm metni"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: 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:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Adres Defteri KaynaklarЩ"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "Hesap YЖneticisi"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_DЭzenle"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Sunucu kimlik denetimi istiyor"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Sunucu MesajЩ:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 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:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "%s iГin parolanЩzЩ girin"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Kimlik Denetimi"
+
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "E-posta Adresi:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Parola"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Adres defterini aГamadЩm"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -590,7 +603,7 @@ msgstr ""
 "Bu adres defteri aГЩlamadЩ. HatalЩ bir adres girilmiЧ,\n"
 "ya da LDAP sunucusu eriЧilemiyor olabilir."
 
-#: addressbook/gui/component/addressbook.c:385
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -602,7 +615,7 @@ msgstr ""
 "programЩ CVS kaynaklarЩndan alacaПЩnЩz openLDAP desteПi\n"
 "ile kurmalЩsЩnЩz:\n"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -610,41 +623,66 @@ 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Herhangi bir alanЩn iГeriПi"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "щsim iГeriПi"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 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:645
+#: calendar/gui/cal-search-bar.c:59
+#, fuzzy
+msgid "Category is"
+msgstr "Kategoriler"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "GeliЧmiЧ..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Kategori:"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "Dizin tarayЩcЩsЩnЩn gЖstereceПi URI"
 
+#.
+#. * 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:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "3. E-posta Adresi"
 
@@ -666,19 +704,19 @@ msgstr "\"%s\" baПlantЩsЩna adres ekle"
 msgid "Querying Addressbook..."
 msgstr "Adres Defterini AraЧtЩrЩlЩyor..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "BaПlantЩ Bilgisini DЭzenle"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "BaПlantЩlara Ekle"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr "E-posta Adresini BirleЧtir"
 
@@ -699,13 +737,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Sil"
 
@@ -717,35 +752,55 @@ msgstr "TЭmЭnЭ Sil"
 msgid "Send HTML Mail?"
 msgstr "HTML Posta GЖnderilsin mi?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "DeПiЧtirilen BaПlantЩ:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "щleti AlЩcЩlarЩ"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "iГerir"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "щsimleri SeГin"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "_BaПlantЩ"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "_Dizinden isim seГin:"
+#, fuzzy
+msgid "F_ind"
+msgstr "Bul:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "щsimleri SeГin"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 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/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "_Dizin"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "щleti AlЩcЩlarЩ"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -760,8 +815,8 @@ msgid "Business _Fax"
 msgstr "щЧyeri _FaksЩ"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Kategoriler..."
 
@@ -770,16 +825,16 @@ msgid "Contact Editor"
 msgstr "щletiЧim DЭzenleyici"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "AyrЩntЩlar"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "FarklЩ Dosyala:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Genel"
 
@@ -804,239 +859,1237 @@ msgstr "Telefon TЭrleri"
 msgid "Wants to receive _HTML mail"
 msgstr "_HTML e-postalarЩnЩ kabul ediyor"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Adres..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "_Sekreterinin adЩ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_DoПum gЭnЭ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Meslek"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_BaПlantЩlar..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Sil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_BЖlЭm:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Tam щsim..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Ev"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_Meslek tanЩmЩ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "_Menejerinin adЩ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Cep"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Lakap:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Ofis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_UzmanlЩk alanЩ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_EЧ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_Bu mektuplaЧma adresidir"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Web 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-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 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:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "YardЩmcЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Meslek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "2. Meslek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "щЧyeri FaksЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Geri Arama"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Araba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "чirket"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "2. ev"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Ev FaksЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Cep"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "DiПer"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "BaЧka Fakslar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "гaПrЩ CihazЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "щlk"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Radyo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "`%s' dizin Жzet dosyasЩ silinemedi: %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "BaПlantЩyЩ HЩzlЩ Ekle"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 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:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Tam щsim"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "E-posta"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "_2. Adres:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "YardЩmcЩ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Otomatik"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Konum"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "AПustos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "yЩl"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Boyut"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "GЖnderiliyor"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "E-posta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Araba"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Adresi Denetle"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Dosya"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Araba"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "DЭzenle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "KopyalanЩyor"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "э_lke:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "ABD"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "щptal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "hafta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finlandiya"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "ЖЖ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Genel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "E-posta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "saat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Pazar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "En DЭЧЭk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "En DЭЧЭk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "Nisan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Mart"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "щleti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "щleti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "щleti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Marjin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "MayЩs"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Pazartesi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Cep"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "YЖnetici"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Cevapla"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Konumu _SeГ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Yeni BaПlantЩ:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "YЭksek"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "Nisan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "dakika"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "чimdi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "YapЩЧtЩr"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "KaПЩt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finlandiya"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Portre"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "sonra"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "BЖlЭmler"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Sakla"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Genel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "ToplantЩ ZamanЩ DЭzenle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Kumlu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Paz"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Lakap"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finlandiya"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "GЖrЭnen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "YaПmurlu"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "GЖrev Listesi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finlandiya"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "AlЩcЩ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "KasЩrga"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Sal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "гЖp"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "(BaЧlЩksЩz щleti)"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "щsimleri SeГin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "GЖrЭnen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "ч_ehir:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Posta Kutusu:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_BЖlge:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "Posta _NumarasЩ:"
 
@@ -1127,6 +2180,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Sil"
@@ -1137,7 +2191,7 @@ msgid "contact-list-editor"
 msgstr "щletiЧim DЭzenleyici"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "щletiЧim DЭzenleyici"
@@ -1147,7 +2201,7 @@ 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:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr "гift BaПlantЩ Bulundu"
 
@@ -1168,14 +2222,19 @@ msgstr ""
 "Yine de eklemek istiyor musunuz?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+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:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "гakЩЧan BaПlantЩ:"
 
-#: 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:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1183,13 +2242,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:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "GeliЧmiЧ Arama"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Ara"
 
@@ -1301,42 +2360,52 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olarak kaydet"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
-msgid "Send contact to other"
-msgstr "BaПlantЩyЩ baЧkasЩna gЖnder"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "AГ"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "_Eklentiyle YЖnlendir"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 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-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "YazdЩr"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "ZarfЩ YazdЩr"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Sil"
 
@@ -1352,7 +2421,8 @@ 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
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
@@ -1361,7 +2431,7 @@ msgstr "Bilinmeyen hata"
 msgid "Repository offline"
 msgstr "гevrimdЩЧЩ ГalЩЧ"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "щzin yok"
 
@@ -1380,8 +2450,11 @@ msgid "Protocol not supported"
 msgstr "щЧlem desteklenmiyor"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "щptal Edildi"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1410,131 +2483,131 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr "KartЩ silerken bir hata oluЧtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* BaПlantЩ eklemek buraya tЩklayЩn *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "FarklЩ Dosyala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "E-posta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "щlk Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Sekreter Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "щЧ Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "Geri Arama Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "чirket Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Kurum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "щЧyeri Adresi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Ev Adresi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Cep Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "AraГ Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "2. щЧ Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "2. Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "DiПer Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "DiПer Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Web SayfasЩ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "BЖlЭm"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Ofis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "SЩfat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "UzmanlЩk alanЩ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "YЖnetici"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Lakap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "EЧ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Not"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "Web SayfasЩ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "TamamlandЩ."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr "Kartlar siliniyor..."
 
@@ -1730,6 +2803,23 @@ msgstr "GeniЧlik:"
 msgid "_Font..."
 msgstr "YazЩtipi..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Takvimi yazdЩr"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Takvimi yazdЩr"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "ZarfЩ YazdЩr"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1884,7 +2974,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "GNOME baЧlatЩlamЩyor"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 msgid "Could not initialize gnome-vfs"
 msgstr "Gnome-vfs baЧlatЩlamЩyor"
 
@@ -1892,149 +2982,140 @@ 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:402
+#: calendar/gui/calendar-commands.c:414
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%d %B %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c: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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%d %b %a"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%d %b %a"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%d %B %A"
 
-#: calendar/gui/calendar-commands.c:586
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/calendar-commands.c:604
 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:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "Genel"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Gizli"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "Genel"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "G"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "B"
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "YЭksek"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "DЭЧЭk"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "hafta"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "MeЧgul"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "BaЧlamadЩ"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "щЧlemde"
 
-#: 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "TamamlandЩ"
 
-#: 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 "щptal Edildi"
-
 #. 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2045,27 +3126,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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: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:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2075,42 +3136,49 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 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:1168
+#: calendar/gui/calendar-model.c:1092
 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:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "TanЩmsЩz"
 
-#: 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."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Yok"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Tekrarlama"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "GЖrevlendirildi"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Evet"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "HayЩr"
 
@@ -2130,30 +3198,86 @@ msgstr "Hafta GЖrЭnЭmЭ"
 msgid "Month View"
 msgstr "Ay GЖrЭnЭmЭ"
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "жzet iГeriПi"
+
+#: calendar/gui/cal-search-bar.c:57
+msgid "Description contains"
+msgstr "AГЩklama iГeriПi"
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "Yorum iГeriПi"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Takvim"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "GЖrevler"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "E-posta Listesi эzerinde VFolder"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Yeni bir randevu yarat"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Yeni Randevu"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Yeni bir gЖrev yarat"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Yeni GЖrev"
+
 #: 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-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "GeliЧmiЧ LDAP SeГenekleri"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "щleti AlЩcЩlarЩ"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "%s'ten E-posta"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2204,114 +3328,120 @@ msgstr "saat"
 msgid "minutes"
 msgstr "dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr "%d gЭn"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 gЭn"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d hafta"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 hafta"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d saat"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 saat"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniye"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 saniye"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Bir ses Гal"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Sonraki iletiyi gЖster"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Bir e-posta gЖnder"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Bir program ГalЩЧtЩr"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Bilinmiyor"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr " randevunun baЧlangЩcЩndan Жnce"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr " randevunun baЧlangЩcЩndan sonra"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr " randevunun bitiminden Жnce"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, fuzzy
 msgid "after end of appointment"
 msgstr " randevunun bitiminden 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr "Temel"
 
 #: 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 "Tarih/Zaman:"
 
 #: 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: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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "жzet:"
 
@@ -2320,12 +3450,11 @@ msgstr "жzet:"
 msgid "_Options..."
 msgstr "_SeГenekler"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "sonra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "Жnce"
 
@@ -2342,7 +3471,7 @@ msgstr "randevu sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -2359,193 +3488,226 @@ msgid "10 minutes"
 msgstr "10 dakika"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 saat (ЖЖ/Жs)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 dakika"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 saat"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 dakika"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 dakika"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "E-posta AyarlarЩ..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr "Tamamlanamayan gЖrevlerin rengi"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Alarm penceresi gЖrЭndЭПЭnde biple."
+msgid "Color for tasks due today"
+msgstr "BugЭn tamamlanmasЩ gereken gЖrevlerin rengi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-msgid "Calendar"
-msgstr "Takvim"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Yeni bir randevu yarat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "Takvim Tercihleri"
+#, fuzzy
+msgid "Days"
+msgstr "GЭn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr "Tamamlanamayan gЖrevlerin rengi"
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "HaftanЩn ilk gЭnЭ:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr "BugЭn tamamlanmasЩ gereken gЖrevlerin rengi"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "Cuma"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr "GЖrevler iГin Renkler"
+#, fuzzy
+msgid "Hours"
+msgstr "saat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
-msgstr "Hafta sonlarЩnЩ ay gЖrЭntЭlemesinde sЩkЩЧtЩr"
+#, fuzzy
+msgid "Minutes"
+msgstr "dakika"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
-msgstr "GЭn Gezgincisi"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Pazartesi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "жntanЩmlЩlar"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "ZamanЩ geГen gЖrevler"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "GЖsterim"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "Cumartesi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "GЭn sonu:"
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "Randevu bitiЧ tarihlerini hafta ve ay Чeklinde gЖster"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "HaftanЩn ilk gЭnЭ:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Hafta numaralarЩnЩ gЖster"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Cum"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "GЭnЭn baЧlangЩcЩ:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Cuma"
+#, fuzzy
+msgid "Su_n"
+msgstr "Paz"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Pazar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "Pzt"
+#, fuzzy
+msgid "T_hu"
+msgstr "Per"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Pazartesi"
+#, fuzzy
+msgid "T_ue"
+msgstr "Sal"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr "Bildirim SeГenekleri"
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "BugЭnЭn iЧleri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
-msgstr "ZamanЩ geГen gЖrevler"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "PerЧembe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "TЭm randevularЩmЩ hatЩrlat"
+msgid "Time"
+msgstr "Zaman"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr "Zaman Dilimi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "Cmt"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Zaman bЖlmeleri:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "Cumartesi"
+msgid "Time format:"
+msgstr "Zaman biГimi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Show appointment end times in week and month views"
-msgstr "Randevu bitiЧ tarihlerini hafta ve ay Чeklinde gЖster"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "SalЩ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Hafta numaralarЩnЩ gЖster"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "гarЧamba"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "GЭnЭn baЧlangЩcЩ:"
+#: ui/evolution-calendar.xml.h:33
+msgid "Work Week"
+msgstr "гalЩЧma HaftasЩ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "Paz"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 saat (ЖЖ/Жs)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Pazar"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 saat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Task List"
-msgstr "GЖrev Listesi"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
-msgstr "BugЭnЭn iЧleri"
+#, fuzzy
+msgid "_Compress weekends in month view"
+msgstr "Hafta sonlarЩnЩ ay gЖrЭntЭlemesinde sЩkЩЧtЩr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "Per"
+#, fuzzy
+msgid "_Display"
+msgstr "GЖsterim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "PerЧembe"
+#, fuzzy
+msgid "_End of day:"
+msgstr "GЭn sonu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Time"
-msgstr "Zaman"
+#, fuzzy
+msgid "_Fri"
+msgstr "Cum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Zaman bЖlmeleri:"
+#, fuzzy
+msgid "_General"
+msgstr "Genel"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Zaman biГimi:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "_Silenen щletileri Gizle"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Time zone:"
-msgstr "Zaman Dilimi:"
+#, fuzzy
+msgid "_Mon"
+msgstr "Pzt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "Sal"
+#, fuzzy
+msgid "_Other"
+msgstr "DiПer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "SalЩ"
+#, fuzzy
+msgid "_Sat"
+msgstr "Cmt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "гar"
+#, fuzzy
+msgid "_Task List"
+msgstr "GЖrev Listesi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "гarЧamba"
+#, fuzzy
+msgid "_Wed"
+msgstr "гar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Work Week"
-msgstr "гalЩЧma HaftasЩ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "dakika Жnce (oluЧmadan)."
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr " randevunun baЧlangЩcЩndan Жnce"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2612,63 +3774,58 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Tarihe gЖre "
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "ToplantЩyЩ dЭzenle"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Randevular"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "GЖrevler"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 #, fuzzy
 msgid "No summary"
 msgstr "щleti Жzeti"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 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
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2676,12 +3833,12 @@ 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
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "FarklЩ Kaydet..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2727,44 +3884,35 @@ msgstr "GerГekten %d gЖrevi silmek istiyor musunuz?"
 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/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Bir dosya seГin"
+msgid "Addressbook..."
+msgstr "Adres Defteri"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "BЖlЭmler:"
+msgid "Delegate To:"
+msgstr "GЖrevi DaПЩt"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-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 ""
+msgid "Enter Delegate"
+msgstr "Silinen"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Randevu"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "HatЩrlatЩcЩ"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Tekrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr "ToplantЩ"
 
@@ -2772,175 +3920,191 @@ msgstr "ToplantЩ"
 msgid "A_ll day event"
 msgstr "_TЭm gЭn olaylarЩ"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "MeЧgul"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "SЩnЩflandЩrma"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Gizli"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Tarih & Zaman"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "hafta"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "ж_zel"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "_Genel"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "GЖster"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "ж_zet:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_Gizli"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "B_itiЧ tarihi:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "B_aЧlangЩГ tarihi:"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "GiriЧimli"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Silinen"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "щЧlemde"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "щstenen Bilgiler"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "SeГimlik Bilgiler"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "GЖnderildi"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Sil..."
@@ -2985,19 +4149,18 @@ 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
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: 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:"
@@ -3042,13 +4205,14 @@ msgstr " "
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 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:1
+#, fuzzy
+msgid "A_dd"
+msgstr "Ekle"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3059,26 +4223,33 @@ msgid "Exceptions"
 msgstr "щstisnalar"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "No recurrence"
-msgstr "Tekrarlama yok"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "жnizleme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Tekrarlama KuralЩ"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Basit tekrar"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "жzel tekrar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "DeПiЧtir"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Tekrarlama yok"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Basit tekrar"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "iГin"
@@ -3120,166 +4291,162 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "_Biten %:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "GЖrevi DaПЩt"
+msgid "Date Completed:"
+msgstr "Tamamlama Tarihi:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "Yok"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "щЧlem"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "GЖrev"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "ж_ncelik:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "_Biten %:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Durum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "щЧlem"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "GЖrevlendirildi"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "AГЩklama:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "_BaЧlangЩГ Tarihi:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Gizli"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Tarihe GЖre:"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "ж_ncelik:"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "_Durum:"
-
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "%0"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "%10"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "%20"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "%30"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "%40"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "%50"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "%60"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "%70"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "%80"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "%90"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "%100"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "_AГ"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Kes"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopyala"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_YapЩЧtЩr"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "BitmiЧ olarak iЧaretle"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Bu gЖrevi sil"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "GЖrevleri bitmiЧ olarak iЧaretle"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "SeГilen gЖrevleri sil"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 msgstr "GЖrev eklemek buraya tЩklayЩn"
 
-#: 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"
@@ -3313,23 +4480,23 @@ msgstr "CoПrafi Konum"
 msgid "Priority"
 msgstr "жncelik"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "BaЧlangЩГ Tarihi"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "жzet"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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"
@@ -3341,151 +4508,260 @@ msgstr "%02i dakika bЖlmeleri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%d %B %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Y_eni TЭm GЭn OlayЩ"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "_BugЭne Git"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Tarihe Git..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Bu Randevuyu Sil"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Bu OluЧumu TaЧЩnabilir Yap"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Bu OluЧumu Sil"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "TЭm OluЧumlarЩ Sil"
 
-#: 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:617
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Son toplantЩ bilgisini al"
 
-#: 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:618
+#, fuzzy
+msgid "Meeting Information"
+msgstr "SeГimlik Bilgiler"
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "ToplantЩ"
 
-#: 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:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
 
-#: 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:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "ToplantЩ _bitiЧ saati:"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:632
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Son toplantЩ bilgisini al"
+
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
 msgstr "Bu, bir toplantЩ isteПine cevaptЩr."
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
-msgstr "Bu bir olay iptalidir."
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "ToplantЩ"
 
-#: 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:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
 
-#: 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:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Bir Eylem SeГin"
 
-#: 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:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
 
-#: 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:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "щletide Bul"
 
-#: 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
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
 
-#: 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:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Bilgi"
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: 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:676
+#, fuzzy
+msgid "Task Update"
+msgstr "daha Жnce"
 
-#: 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:680
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Bu, son gЖrev bilgisi iГin bir istektir."
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Cevapla"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:691
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Bu bir gЖrev iptalidir."
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Takvim MesajЩ"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "щstenen Bilgiler"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "щstenen Bilgiler"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "Bu, son gЖrev bilgisi iГin bir istektir."
+
+#: calendar/gui/e-itip-control.c:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "Web SayfasЩ"
+
+#: calendar/gui/e-itip-control.c:723
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr "Bu, bir toplantЩ isteПine cevaptЩr."
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "Web SayfasЩ"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "щletiyi YazdЩr"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "Takvim dosyanЩ gЭncelleyemedim!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Tamamlama Tarihi:"
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Bu ЖПe takvim dosyasЩndan silinemedi!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "_Biten %:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "GЖnderilme tarihi"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3523,44 +4799,27 @@ msgstr "bitiЧ-tarihi"
 msgid "date-start"
 msgstr "baЧlangЩГ-tarihi"
 
-#: 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:252
-msgid "Category:"
-msgstr "Kategori:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "%s iГindeki gЖrevler yЭklenemedi."
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' yЭklemek iГin gereken yЖntem desteklenmiyor"
 
-#. 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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Yeni Randevu..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' dizini aГЩlamadЩ."
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' aГmak iГin gereken yЖntem desteklenmiyor"
@@ -3586,43 +4845,43 @@ msgid "Go To Date"
 msgstr "Tarihe Git"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Temmuz"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Haziran"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Mart"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "MayЩs"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "KasЩm"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Ekim"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "EylЭl"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "BugЭne Git"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3778,12 +5037,6 @@ msgstr "Cu"
 msgid "Sa"
 msgstr "Ct"
 
-#: 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:1815
 #, fuzzy
@@ -3820,9 +5073,8 @@ msgid "Print Calendar"
 msgstr "Takvimi YazdЩr"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "жnizlemeyi YazdЩr"
 
@@ -3834,7 +5086,7 @@ msgstr "жПeyi YazdЩr"
 msgid "Print Setup"
 msgstr "YazdЩrma AyarlarЩ"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "GЖsterilecek gЖrevler dizininin URI'si"
 
@@ -3876,6 +5128,109 @@ 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr "time-add-day 2 argЭman istiyor"
+
+#: calendar/pcs/query.c:289
+#, fuzzy
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr "time-day-end birinci argЭmanЩ time_t biГiminde istiyor"
+
+#: calendar/pcs/query.c:296
+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:323
+msgid "time-day-begin expects 1 argument"
+msgstr "time-day-begin bir argЭman istiyor"
+
+#: calendar/pcs/query.c:328
+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:355
+msgid "time-day-end expects 1 argument"
+msgstr "time-day-end bir argЭman istiyor"
+
+#: calendar/pcs/query.c:360
+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:396
+msgid "get-vtype expects 0 arguments"
+msgstr "get-vtype hiГ argЭman istemiyor"
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr "ocrur-in-time-range? iki argЭman istiyor"
+
+#: calendar/pcs/query.c:497
+#, fuzzy
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr "time-day-end birinci argЭmanЩ time_t biГiminde istiyor"
+
+#: calendar/pcs/query.c:504
+#, fuzzy
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr "time-day-end birinci argЭmanЩ time_t biГiminde istiyor"
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr "contains? iki argЭman istiyor"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr "contains? birinci argЭmanЩ dizgi Чeklinde istiyor"
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr "contains? ikinci argЭmanЩ dizgi Чeklinde istiyor"
+
+#: calendar/pcs/query.c:663
+#, fuzzy
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr "contains? birinci argЭmanЩ dizgi Чeklinde istiyor"
+
+#: calendar/pcs/query.c:705
+#, fuzzy
+msgid "has-categories? expects at least 1 argument"
+msgstr "has-categories? tЭm argЭmanlarЩ dizgi Чeklinde istiyor"
+
+#: calendar/pcs/query.c:717
+#, fuzzy
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr "has-categories? tЭm argЭmanlarЩ dizgi Чeklinde istiyor"
+
+#: calendar/pcs/query.c:805
+#, fuzzy
+msgid "is-completed? expects 0 arguments"
+msgstr "time-now hiГ argЭman istemiyor"
+
+#: calendar/pcs/query.c:1008
+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"
@@ -3933,6 +5288,7 @@ msgid "Unable to process spool folder"
 msgstr "Spool dizini iЧlenemedi"
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) iletisi alЩnЩyor"
 
@@ -3969,7 +5325,7 @@ msgstr "%s filtresini ayrЩЧtЩrЩrken hata oldu: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "%s filtresini ГalЩЧtЩrЩrken hata oldu: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramasЩnЩ ГalЩЧtЩrЩrken hata oldu: %s"
@@ -3996,12 +5352,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(hepsini-eЧle) boolean sonuГ iГermelidir"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bilinmeyen baЧlЩk Эzerinde arama yapЩlЩyor: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "GЖvde iГeriПinde geГersiz tЭr. Dizgi bekleniyordu"
 
@@ -4117,13 +5473,13 @@ msgid "No plaintext to sign."
 msgstr "щmzalanacak metin yok."
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Parola verilmedi"
 
 #: 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ile baПlantЩ kurulamadЩ: %s"
@@ -4141,15 +5497,15 @@ msgstr "DoПrulanacak metin yok."
 msgid "Couldn't create temp file: %s"
 msgstr "%s geГici dosyasЩ yaratЩlamadЩ"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "чifrelenecek metin yok."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "AlЩcЩ belirtilmedi"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr "AГЩlacak Чifre metni yok."
 
@@ -4183,7 +5539,7 @@ msgid "Connection cancelled"
 msgstr "BaПlantЩ iptal edildi"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s adresine baПlantЩ kurulamadЩ (%d): %s"
@@ -4194,7 +5550,7 @@ msgstr "(bilinmeyen makine)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "щЧlem iptal edildi"
 
@@ -4320,42 +5676,69 @@ msgstr "Bu seГenek sunucuya basit bir parola kullanarak baПlantЩ kuracaktЩr."
 msgid "Unknown authentication state."
 msgstr "Bilinmeyen kimlik denetim konumu."
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Parola"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Kaynaklar"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "DЭzgЭn deyim derleme iЧlemi baЧarЩsЩz: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URL'inde kullanЩcЩ bilgisi bulunmuyor"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URL'inde makine adЩ bilgisi bulunmuyor"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL'inde dizin bilgisi bulunmuyor"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "гЖzЭmleniyor: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "щsim ГЖzЭmlemesinde hata: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Makine adЩ ГЖzЭmlemesinde hata: %s: Makine bulunamadЩ"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Makine adЩ ГЖzЭmlemesinde hata: %s: bilinmeyen hata"
@@ -4368,12 +5751,12 @@ msgstr "Sanal dizin e-posta saПlayЩcЩsЩ"
 msgid "For reading mail as a query of another set of folders"
 msgstr "diПer bir dizin listesinden alЩnan iletileri okumak iГin"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolЭ iГin alЩcЩ yok"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4419,7 +5802,7 @@ msgstr "MesajЩn aГЩlmasЩnda hata."
 msgid "Failed to verify certificates."
 msgstr "Sertifika denetlenemedi."
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4429,7 +5812,7 @@ msgstr ""
 "Konu: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4482,61 +5865,61 @@ 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-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komutu baЧarЩsЩz oldu: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "Sunucu cevabЩ Гok erken bitti."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, 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:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP sunucudan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s dizini yaratЩlamadЩ: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s iГin Жzet bilgisi yЭklenemedi"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 msgid "Folder was destroyed and recreated on server."
 msgstr "Sunucudaki dizin silindi ve yeniden oluЧturuldu."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:437
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "щletiler kaydediliyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "щletiler kaydediliyor"
@@ -4550,7 +5933,7 @@ msgstr "FETCH cevabЩnda ileti gЖvdesi bulunamadЩ"
 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
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Yeni iletiler denetleniyor"
 
@@ -4558,7 +5941,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Dizinler"
 
@@ -4598,7 +5981,7 @@ 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:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s kimlik sЩnama yЖntemi desteklenmiyor"
@@ -4609,7 +5992,7 @@ 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:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
@@ -4624,12 +6007,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4719,7 +6102,7 @@ msgstr "%s dizinine ileti eklenemedi: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4733,7 +6116,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4804,20 +6187,20 @@ msgstr "Maildir dizini aГЩlamadЩ: %s: %s"
 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-mbox-folder.c:209
 #: 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"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "щleti mbox dosyasЩna eklenemedi (%s): %s"
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4829,12 +6212,12 @@ msgstr ""
 "%s iletisi %s dizininden alЩnamadЩ\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "щletiler dЭzenlenemiyor: щleti kutusu bozulmuЧ olabilir."
@@ -4882,13 +6265,14 @@ msgstr "`%s' dizini boЧ deПil. Silinmedi."
 #. 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"
+#, fuzzy
+msgid "Summarizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing 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
@@ -4898,24 +6282,22 @@ 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"
+#, fuzzy, c-format
+msgid "Cannot summarize 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
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "жzet iГin dizin aГЩlamadЩ: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5019,6 +6401,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Dizin Жzeti ГЩkartЩlamadЩ: %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c: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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5109,39 +6502,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s iГin .newsrc dosyasЩ aГЩlamadЩ ya da oluЧturulamadЩ: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "POP Жzeti alЩnЩyor"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP sunucuya baПlantЩ kurulamadЩ: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Dizin aГЩlamadЩ: щleti listesi tamamlanmadЩ."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "%s kullanЩcЩ numarasЩyla ileti yok"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "%d. POP iletisi alЩnЩyor"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "щletiler alЩnamadЩ: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "%s POP sunucusundan iletileri alamadЩm: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "%s kullanЩcЩ numarasЩyla ileti yok"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "%d. POP iletisi alЩnЩyor"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "щleti deposu"
@@ -5155,7 +6548,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:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5244,7 +6637,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:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5296,7 +6689,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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5304,122 +6697,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:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "щmla hatasЩ, bilinmeyen komut"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametre ya da argЭmanlarda imla hatasЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Komut henЭz tanЩnmЩyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "Komut parametresi henЭz tanЩnmЩyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr "Sistem durumu, ya da sistem yardЩm yanЩtЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "YardЩm mesajЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Servis hazЩr"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Servis iletiЧim kanalЩnЩ kapatЩyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 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:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "щstenen ileti iЧlemi tamamlandЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 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:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "щstenen ileti eylemi yapЩlmadЩ: posta kutusu bulunamadЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "щstenen eylem yapЩlmadЩ: posta kutusu bulunamadЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 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:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 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:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr "щstenen eylem yapЩlmadЩ: disk alanЩ yetersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "щstenen eylem iptal edildi: disk alanЩ yetersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 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:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 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:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "щletiЧim kurulamadЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "Parola iletimi gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "Kimlik sЩnama yЖntemi Гok zayЩf"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 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:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "GeГici kimlik denetim hatasЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Kimlik denetimi isteniyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "GiriЧ hatasЩ: %s: Жnemsiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, 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:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5430,127 +6823,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP sunucu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s Эzerinden STMP ileti gЖnderimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 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:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr "щleti gЖnderilemiyor: gЖnderen adresi geГersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "щleti gЖnderiliyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "MAIL FROM cevap hatasЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "ToplantЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO cevap hatasЩ: %s: ileti gЖnderilmedi"
 
-#: 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:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Kimlik Denetimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr "SASL kimlik denetim nesnesi yaratЩlamadЩ."
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, 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:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr "AUTH isteПi baЧarЩsЩz."
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "Sunucudan hatalЩ kimlik sЩnama yanЩtЩ.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, 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:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, 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:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET cevap hatasЩ: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, 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:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT cevap hatasЩ: %s: Жnemsiz"
@@ -5580,7 +6973,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "ek"
 
@@ -5613,52 +7006,52 @@ msgstr "MIME tЭrЭ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Eklentinin otomatik gЖsterimini Жner"
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Adres defteri iГin buraya tЩklayЩn"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "GЖnderen:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Cevapla:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Konu:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "AlЩcЩ:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "щletinin gЖnderildiПi kiЧiler"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Bilgi:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "щletinin kopyasЩnЩn gЖnderilecek olunduПu adresler"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Gizli:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5689,30 +7082,30 @@ msgstr ""
 "%s dosyasЩnЩ yЭklerken hata oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "FarklЩ kaydet..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "UyarЩ"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "%s dosyasЩnЩ kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5720,17 +7113,17 @@ msgstr ""
 "Bu hesap iГin taslak dizini aГЩlamadЩ.\n"
 "жntanЩmlЩ taslak dizinini kullanmak istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "%s dosyasЩnЩ kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "%s POP sunucusundan iletileri alamadЩm: %s"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5739,7 +7132,7 @@ msgstr ""
 "гЩkЩЧ dosyasЩ yaratЩlamadЩ: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5748,7 +7141,7 @@ msgstr ""
 "гЩkЩЧ dosyasЩ yaratЩlamadЩ: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5757,16 +7150,16 @@ msgstr ""
 "щletilerin kaydЩnda hata: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 #, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution, Pine e-posta dosyalarЩ buldu.\n"
 "BunlarЩn Evolution'a aktarЩlmasЩnЩ istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5775,24 +7168,24 @@ msgstr ""
 "Bu ileti gЖnderilmedi.\n"
 "DeПiЧiklikleri kaydetmek istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "DosyayЩ aГ"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "Dosya _Ekle"
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Mektup gЖnderme penceresi aГЩlamadЩ."
 
@@ -5820,57 +7213,103 @@ msgstr "adres kartЩ"
 msgid "calendar information"
 msgstr "takvim bilgisi"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "iГerir"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "iГermez"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "Yorum iГeriПi"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "щsim iГeriПi"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "AГЩklama iГeriПi"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "щsim iГeriПi"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "щsim iГeriПi"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "iГermez"
+
 #. 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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%d %b %Y %a"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5878,13 +7317,13 @@ 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:303
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -5982,7 +7421,7 @@ msgstr "Чimdiki zamana gЖreceli bir zaman"
 msgid "Compare against"
 msgstr "KarЧЩlaЧtЩr"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "Чimdi"
 
@@ -5994,11 +7433,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<bir tarih seГmek iГin tЩklayЩnЩz>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Filtre KurallarЩ"
 
@@ -6019,20 +7462,20 @@ 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:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Dizini SeГin"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Dizin URI girin"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<bir dizin seГmek iГin tЩklayЩn>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6053,62 +7496,51 @@ msgstr "Kural adЩ:"
 msgid "Untitled"
 msgstr "щsimsiz"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "EПer"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Eylemleri iЧlet"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "tЭm kriterler saПlanЩrsa"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "herhangi bir kriter saПlanЩrsa"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "SЩnЩf ekle"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "gelen"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Filtreleri DЭzenle"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "VFolder DЭzenle"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Gelen"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Giden"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Sanal Dizinler"
 
@@ -6132,194 +7564,195 @@ msgstr "tЭm yerel ve etkin uzak dizinlerle birlikte"
 msgid "with all local folders"
 msgstr "tЭm yerel dizinlerle birlikte"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Renk Belirt"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Puan Belirt"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Ekler"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "iГerir"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Dizine Kopyala"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "AlЩnma tarihi"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "GЖnderilme tarihi"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Silinen"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "iГermez"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "sonlanmaz"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "bulunmaz"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "benzemez"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "baЧlamaz"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Bulunmaz"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Taslak"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "biter"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "bulunur"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "bulunur"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Deyim"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "жnemli"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr " "
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "bЭyЭk"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "kЭГЭk"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "deПil"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "E-posta listesi"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "щleti GЖvdesi"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "щleti BaЧlЩПЩ"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "щleti alЩndЩ"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "щleti gЖnderildi"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Dizine TaЧЩ"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "birlikte ya da sonra"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "birlikte ya da Жnce"
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Oku"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "AlЩcЩlar"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "DЭzgЭn Deyim EЧleЧimi"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Cevaplanan"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Puan"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "GЖnderen"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Durum belirt"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Boyut"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "benzer"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Kaynak Hesap"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "жzel baЧlЩk"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "baЧlayan"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "щЧlemeyi Durdur"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Konu"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "iГerir"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "iГermez"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "sonlanmaz"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "bulunmaz"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "benzemez"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "baЧlamaz"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "biter"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "bulunur"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "bЭyЭk"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "kЭГЭk"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "deПil"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr " "
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "birlikte ya da sonra"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "birlikte ya da Жnce"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "benzer"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "baЧlayan"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "daha Жnce"
@@ -6349,14 +7782,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Aktar"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "щleti"
 
@@ -6384,11 +7816,11 @@ msgstr ""
 "Evolution, GnomeCard dosyalarЩ buldu.\n"
 "BunlarЩn Evolution'a aktarЩlmasЩnЩ istiyor musunuz?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6444,167 +7876,188 @@ msgstr "E-posta Жzet bileЧen mimarisi"
 msgid "Mail configuration interface"
 msgstr "щleti yapЩlandЩrma arayЭzЭ"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "E-posta Listesi эzerinde VFolder"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "ж_zellikler..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Bu dizinin Жzelliklerini deПiЧtir"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "_щletiyi GЖnder"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "_щletiyi GЖnder"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution'Щn posta programЩ baЧlatЩlamadЩ."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "Depo kabuПa kayЩt ettirilemedi"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" Жzellikleri"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "жzellikler"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "щ_letiden Bir Filtre Yarat"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "_Konuya GЖre VFolder"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "_GЖnderene GЖre VFolder"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "_AlЩcЩlara GЖre VFolder"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi эzerinde VFolder"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "_Konuya GЖre Filtrele"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "_GЖnderene GЖre Filtrele"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "_AlЩcЩlara GЖre Filtrele"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listelerine GЖre Filtrele"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "Yeniden GЖnder"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "щletiyi YazdЩr..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_FarklЩ Kaydet..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_YazdЩr"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_GЖnderene Cevapla"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "_TЭmЭne Cevapla"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_YЖnlendir"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "_OkunmuЧ Olarak щЧaretle"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Oku_nmamЩЧ Olarak щЧaretle"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "жnemli"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Oku_nmamЩЧ Olarak щЧaretle"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_Dizine TaЧЩ..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Silme"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "GЖndereni Adres Defterine Ekle"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Filtreleri Uygula"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "щletiden Bir Kural Yarat"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "E-posta Listelerine GЖre Filtreleme"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "E-posta Listesi эzerinde VFolder"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "E-posta Listesine Filtre (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "E-posta Listesi эzerinde VFolder (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "SeГimlik Bilgiler"
+
 #: 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"
@@ -6666,15 +8119,15 @@ msgid "Evolution News Editor"
 msgstr "Evolution Hesap DЭzenleyici"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap DЭzenleyici"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "щmzayЩ kaydet"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6684,40 +8137,45 @@ msgstr ""
 "\n"
 "DeПiЧiklikleri kaydetmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (ЖntanЩmlЩ)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Kapat"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "EtkinleЧtir"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "GerГekten bu hesabЩ silmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Sil"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "Bunu ЖntanЩmlЩ hesabЩm yap"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "GerГekten bu haber grubu hesabЩnЩ silmek istiyor musunuz?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Evolution Hesap YЖneticisi"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "E-posta AyarlarЩ..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6771,11 +8229,11 @@ msgstr ""
 "щleti gЖndermeden Жnce bir posta\n"
 "iletim ayarЩ yapmalЩsЩnЩz."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "Posta iletim yЖntemi dЭzenlenmemiЧ"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6783,7 +8241,7 @@ msgstr ""
 "Bu iletinin konusu yok.\n"
 "Yine de gЖnderilsin mi?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6795,37 +8253,36 @@ msgstr ""
 "getirebilir.\n"
 "Yine de gЖndereyim mi?"
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 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:410
+#: mail/mail-callbacks.c:390
 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:653
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "%s tarihinde, %s dedi ki:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "YЖnlendirilmiЧ ileti:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "щletileri buraya taЧЩ"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "щleti(leri) buraya kopyala"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, 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:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6833,7 +8290,7 @@ msgstr ""
 "Sadece taslaklar dizinine kaydedilen\n"
 "iletileri dЭzenleyebilirsiniz."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6841,24 +8298,41 @@ msgstr ""
 "Sadece GЖnderilen dizinine kaydedilen\n"
 "iletileri yeniden gЖnderebilirsiniz."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, 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:1463
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "HiГ щleti SeГilmedi"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "щletiyi FarklЩ Kaydet..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "щletileri FarklЩ Kaydet..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "UyarЩ"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Tekrar sorma"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6867,140 +8341,157 @@ msgstr ""
 "Filtre bilgisini yЭklerken hata oluЧtu:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filtreler"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "щletiyi YazdЩr"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "щletiyi yazdЩrЩlmasЩnda hata"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, 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-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 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."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "LЭtfen adЩnЩzЩ ve e-posta adresinizi aЧaПЩdaki boЧluПa yazЩn. E-posta "
 "adresinizde gЖrЭnmesini istemiyorsanЩz seГimlik alanlarЩ doldurmanЩza gerek "
 "yoktur. "
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "LЭtfen gelen e-posta sunucusu iГin bilgi verin. EПer hangi tЭr bir sunucu "
 "kullandЩПЩnЩzЩ bilmiyorsanЩz sistem yЖneticinize, ya da щnternet servis "
 "saПlayЩcЩnЩza baЧvurun."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "LЭtfen giden e-posta sunucusu iГin protokol bilgisini aЧaПЩda belirtin. EПer "
 "hangi protokolЭ kullandЩПЩnЩzЩ bilmiyorsanЩz sistem yЖneticinize, ya da "
 "щnternet servis saПlayЩcЩnЩza baЧvurun."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 "E-posta yapЩlandЩrma iЧlemi neredeyse tamamlandЩ. Kimlik ayarlarЩnЩz, gelen "
 "ve giden e-posta sunucunuz Evolution hesabЩnЩzЩ tanЩmlamak iГin yeterli "
 "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:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Evolution Hesap SihirbazЩ"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "pkutusu"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 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 "
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " renk"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Bu Чifreleme ile imza desteklenmiyor"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Hesap"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Hesap Bilgisi"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Hesap YЖneticisi"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Ek"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Kimlik Denetimi"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Kimlik Denetim TЭrЭ: "
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr "E-postalarЩ otomatik denetle:"
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr "Sertifika No:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "DЭzenleyici"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7016,281 +8507,258 @@ msgstr ""
 "\n"
 "AyarlarЩnЩzЩ kaydetmek iГin \"Bitir\" dЭПmesine tЩklayЩn."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "ж_ntanЩmlЩ"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Default Forward style is: "
 msgstr "жntanЩmlЩ \"YЖnlendirme\" tЭrЭ: "
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+#, fuzzy
+msgid "Default character encoding: "
 msgstr "жntanЩmlЩ karakter kЭmesi: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr "SayЩsal Numaralar..."
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "GЖsterim"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "TamamlandЩ"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Taslaklar dizini:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "DЭzenle..."
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "E_nable"
+msgstr "EtkinleЧtir"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "E-posta Adresi:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "GЭncel dosyayЩ farklЩ bir isimle kaydet"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "DЭzenle..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "EtkinleЧtir"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Tam щsim:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "SayЩsal NumarayЩ Al..."
 
-#: mail/mail-config.glade.h:42
-msgid "HTML Signature:"
-msgstr "HTML щmzasЩ:"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "Highlight citations with"
-msgstr "Renklendir: "
+msgid "HTML signature file:"
+msgstr "HTML щmzasЩ:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "HTML iletide"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "_BaПlantЩda"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: 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:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "E-posta YapЩlandЩrmasЩ"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, 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:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "щletileri okunmuЧ olarak iЧaretle:"
+msgid "Make this my _default account"
+msgstr "Bunu ЖntanЩmlЩ hesabЩm yap"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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:60
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Haberler"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "SeГimlik Bilgiler"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Kurum:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "PGP Anahtar NumarasЩ:"
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr "PGP program yolu:"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Bir renk seГin"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Prompt when sending messages with an empty subject"
+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
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+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
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "_KotelenmiЧ"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "E-posta AlЩnЩyor"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "E-posta AlЩnЩyor"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Alma SeГenekleri"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "щstenen Bilgiler"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "GЭvenli MIME"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "GЭvenlik"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Bir dosya seГin"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP programЩnЩ seГin"
 
-#: 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:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "E-posta GЖnderiliyor"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "E-posta GЖnderiliyor"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "GЖnderildi"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "GЖnderilen ve Taslak щletileri"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "GЖnderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Sunucu YapЩlandЩrmasЩ"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Sunucu TЭrЭ: "
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "Sunucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "щmza dosyasЩ:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Kaynaklar"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Bilgi Yok"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Kaynaklar"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "жzel Dizinler"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyasЩ"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use secure connection (_SSL)"
 msgstr "GЭvenli baПlantЩ (SSL) kullan"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "KullanЩcЩ adЩ:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7298,15 +8766,120 @@ msgstr ""
 "\n"
 "Devam etmek iГin \"щleri\" dЭПmesine tЩklayЩn."
 
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "E-postalarЩ otomatik denetle:"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr " Desteklenen tЭrleri denetle "
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "E-posta Adresi:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Tam щsim:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "HTML щmzasЩ:"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "Renklendir: "
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "Makina:"
+
+#: mail/mail-config.glade.h:102
+#, fuzzy
+msgid "_Load images if sender is in addressbook"
+msgstr "GЖnderici adres defterinde ise resimleri yЭkle"
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "щletileri okunmuЧ olarak iЧaretle:"
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "щsim:"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Kurum:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "PGP program yolu:"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Yol:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Bu parolayЩ hatЩrla"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "E-postalarЩ ЖntanЩmlЩ olarak HTML gЖnder."
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "щmza dosyasЩ:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "KullanЩcЩ adЩ:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "saniye."
 
@@ -7346,181 +8919,192 @@ msgstr "S/MIME Чifreli zarf iГeriПi oluЧturulamЩyor."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kodlama iГeriПi oluЧturulamЩyor."
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Eki Kaydet"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Diske Kaydet..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "щzle"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "%s iГinde aГ..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "щzle (%s kullanarak)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Gizle"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Harici щzleyici"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "щleti iГeriПi yЭkleniyor"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "BaПlantЩyЩ TarayЩcЩda AГ"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "FarklЩ kaydet"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "FarklЩ kaydet..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "%d dakika"
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Silinen"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d saniye"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME iletisi aГЩlamadЩ: Kaynak kodu gЖsteriliyor."
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Tarih"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "E-posta Adresi:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "GЖnderen"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr "YanЩtla:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "AlЩcЩ"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr "Bilgi:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP program yapЩlandЩrЩlmadЩ."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "чifrelenmiЧ ileti gЖsterilemiyor"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "чifrelenmiЧ ileti"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "чifreyi aГmak iГin simgeye tЩklayЩn"
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 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:1388
+#: mail/mail-format.c:1403
 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:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine baП (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, 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:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya baП (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP adresine baП (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye baП (\"%s\" tЭrЭnde)"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr "Bozuk harici gЖvde"
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Bu isimde bir dizin yok: `%s'"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "'%s' aГЩlЩyor"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" biГiminden \"%s\" biГimine geГiliyor"
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7529,7 +9113,7 @@ msgstr ""
 "Dizin meta bilgisi kaydedilemedi. BЭyЭk ihtimalle bu dizini \n"
 "yeniden aГamayacaksЩnЩz: %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7537,12 +9121,12 @@ msgstr ""
 "EПer bu dizini tekrar aГamazsЩnЩz, elle \n"
 "dЭzeltme yapmak zorunda kalacaksЩnЩz."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, 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
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Yeniden YapЩlandЩr: %s"
@@ -7565,104 +9149,129 @@ msgstr ""
 "щЧlem sЩrasЩnda hata:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Bu parolayЩ hatЩrla"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "гalЩЧЩyor"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Dizin tazeleniyor"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "E-posta AlЩnЩyor"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" gЖnderiliyor"
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti gЖnderiliyor"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d iletide hata"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "TamamlandЩ."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "щletiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "щletiler %s'e taЧЩnЩyor"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "щletiler %s'e kopyalanЩyor"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "TaЧЩnЩyor"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "KopyalanЩyor"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" iГinde dizinler taranЩyor"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "гЖp"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "YЖnlendirilen iletiler"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini aГЩlЩyor"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu aГЩlЩyor"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Yeni dizin yaratЩlЩyor"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Dizin eЧzamanlЩ hale getiriliyor"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s iletisi alЩnЩyor"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "щletiler alЩnЩyor"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "щletiler kaydediliyor"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7671,7 +9280,7 @@ msgstr ""
 "гЩkЩЧ dosyasЩ yaratЩlamadЩ: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7680,11 +9289,11 @@ msgstr ""
 "щletilerin kaydЩnda hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7693,79 +9302,75 @@ msgstr ""
 "гЩkЩЧ dosyasЩ yaratЩlamadЩ: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazЩlamadЩ: %s."
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s baПlantЩsЩ kesiliyor"
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Ara"
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(BaЧlЩksЩz щleti)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(BaЧlЩksЩz щleti)"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "щleti"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "щletide Bul"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "KЭГЭk/bЭyЭk Harfe DuyarlЩ"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr "щleri DoПru Arat"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Bul:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "EЧleЧenler:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "щptal ediliyor..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "E-posta Al & GЖnder"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "AlЩnЩyor"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "GЭncelleniyor..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "GЖnderiliyor"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "щptal edildi."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr "KullanЩcЩ iЧlemi iptal etti."
 
@@ -7784,82 +9389,88 @@ msgstr "YЖnlendirilmiЧ ileti - %s"
 msgid "Forwarded message"
 msgstr "YЖnlendirilen iletiler"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "YЖnlendirilen iletiler"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "VDizin"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "щlt: (konusuz)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "щleti"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "GЖrЭnmeyen"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "GЖrЭnen"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Cevaplanan"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "гoklu GЖrЭlmeyen щleti"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "гoklu щletiler"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "En DЭЧЭk"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "DЭЧЭk"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "YЭksek"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "En YЭksek"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "BugЭn %l:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "DЭn %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "щletiler kaydediliyor"
 
 #: mail/message-list.etspec.h:2
@@ -7874,38 +9485,77 @@ msgstr "AlЩndЩ"
 msgid "Size"
 msgstr "Boyut"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Dizin"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "Sakla"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Bununla baЧlayan dizinleri gЖster:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "\"%s\" iГinde dizinler taranЩyor"
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "\"%s\" iГin depo alЩnЩyor"
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "\"%s\" iГinde dizinler taranЩyor"
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" dizinine Эye olunuyor"
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" dizininden Эyelik siliniyor"
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Dizin"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "Bu bir toplantЩ isteПidir."
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Listeyi Tazele"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Dizini seГin"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Bununla baЧlayan dizinleri gЖster:"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "эyelikleri DЭzenle"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "эye ol"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "эyelikten ГЩk"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "жzet iГin Evolution bileЧeni"
@@ -7914,52 +9564,69 @@ msgstr "жzet iГin Evolution bileЧeni"
 msgid "Factory for the Evolution executive summary component."
 msgstr "Evolution Жzet bileЧen mimarisi."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Evolution жzet bileЧeni ilklendirilemedi."
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Randevular"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 msgid "No appointments"
 msgstr "Randevu yok"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%a %l %M %p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "щleti Жzeti"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "щsim:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Evolution AyarlarЩ..."
+msgid "Summary Settings"
+msgstr "жzet iГeriПi"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -7969,7 +9636,12 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>RDF indirirken bir hata oluЧtu</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Ayarlar"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Yeni GЖrev"
@@ -7978,33 +9650,74 @@ msgstr "Yeni GЖrev"
 msgid "My Weather"
 msgstr "Hava Durumu"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Hava Durumu"
+
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "BЖlЭmler"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
-msgstr "%d %B %A"
+msgid "%A, %B %e %Y"
+msgstr "%d %B %A, %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolution"
+msgid "Print Summary"
+msgstr "жzet"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "щletiyi yazdЩrЩlmasЩnda hata"
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Bonobo baЧlatЩlamadЩ.\n"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "YazЩtipleri"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "TaЧЩnЩyor"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Filtreler"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "Filtreler"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "GЖkyЭzЭnЭ temizle"
@@ -9177,126 +10890,143 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Cevaplanan"
+msgid " _Remove"
+msgstr "Sil"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Dizini seГin"
+msgid "Add n_ew feed"
+msgstr "Cevaplanan"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "TЭm KatЩlЩmcЩlar"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "TЭm KatЩlЩmcЩlar"
+msgid "All _folders:"
+msgstr "Dizini seГin"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Bununla baЧlayan dizinleri gЖster:"
+msgid "All news _feeds:"
+msgstr "Cevaplanan"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Bununla baЧlayan dizinleri gЖster:"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "GЖsterim"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
 #, fuzzy
-msgid "Five days"
-msgstr "Cuma"
+msgid "News Feed Settings"
+msgstr "Ayarlar"
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "ay"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "1 hafta"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
 #, fuzzy
-msgid "News Feed Settings"
-msgstr "Ayarlar"
+msgid "Show _all tasks"
+msgstr "TЭmЭnЭ GЖster"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "TЭmЭnЭ GЖster"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "1 gЭn"
+msgid "Tasks "
+msgstr "GЖrevler"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "ay"
+msgid "Units: "
+msgstr ""
+"\n"
+"  эnite:  "
 
 #: 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):"
+msgid "Weather settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr "ToplantЩ ZamanЩ DЭzenle"
+msgid "_Display folders:"
+msgstr "Bununla baЧlayan dizinleri gЖster:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "TЭmЭnЭ GЖster"
+msgid "_Display stations:"
+msgstr "Bununla baЧlayan dizinleri gЖster:"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "_KapsamlЩ BaЧlЩklarЩ GЖster"
+msgid "_Displayed feeds:"
+msgstr "GЖsterim"
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "Show today's tasks"
-msgstr ""
+#, fuzzy
+msgid "_Five days"
+msgstr "Cuma"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "GЖrevler"
+msgid "_Mail"
+msgstr "щleti"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  эnite:  "
+msgid "_News Feeds"
+msgstr "Ayarlar"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Hava Durumu"
+msgid "_One day"
+msgstr "1 gЭn"
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "Weather settings"
+msgid "_Refresh time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "Nisan"
+msgid "_Schedule"
+msgstr "ToplantЩ ZamanЩ DЭzenle"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "_KapsamlЩ BaЧlЩklarЩ GЖster"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Hava Durumu"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "Nisan"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9313,7 +11043,17 @@ msgstr "AyrЩntЩlar"
 msgid "Cancel Operation"
 msgstr "ToplantЩyЩ щ_ptal Et"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "pkutusu"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "pkutusu"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "жzel Dizinler"
@@ -9370,7 +11110,7 @@ msgstr ""
 "Dosyalar kopyalanamadЩ\n"
 "`%s'."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9381,7 +11121,7 @@ msgstr ""
 "Evolution kullanЩcЩ dosyalarЩnЩn yЭklenmesi\n"
 "bunu silmelisiniz."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9390,7 +11130,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9401,55 +11141,77 @@ 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-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "%s dizini alЩnamadЩ: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "Dosyalar kopyalanamadЩ\n"
 "`%s'."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, 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:275
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "Dizini kopyala"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, 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:318
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "Dizini taЧЩ"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"`%s' dizini silinemedi:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "'%s' dizinini sil"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, 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:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "'%s' dizini yeniden isimlendir"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+msgid "Rename"
+msgstr "Yeniden isimlendir"
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Dizin adЩ:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9463,7 +11225,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "Belirtilen dizin adЩ geГerli deПildir."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Yeni dizin yarat"
 
@@ -9475,11 +11237,11 @@ msgstr ""
 "щstenen iЧlem iГin seГili dizin tipi \n"
 "geГerli deПildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Yeni..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(isimsiz)"
 
@@ -9519,7 +11281,7 @@ msgstr ""
 "%s alЩnЩyor\n"
 "%d ЖПesi alЩnЩyor."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9568,7 +11330,7 @@ msgstr "Otomatik"
 msgid "Filename:"
 msgstr "Dosya adЩ:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Bir dosya seГin"
 
@@ -9576,31 +11338,53 @@ msgstr "Bir dosya seГin"
 msgid "File type:"
 msgstr "Dosya tЭrЭ:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Dizini seГin"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr "Bu veriyi almak iГin hedef dizin seГin"
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr "BaПlantЩlar kesiliyor..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Evolution'Щn posta programЩ baЧlatЩlamadЩ."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH dizininde bulunamadЩ."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy ГalЩЧtЩrЩlamadЩ."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Telif hakkЩ 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9609,90 +11393,107 @@ 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:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Dizine git..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr "AГmak istediПiniz dizini seГin"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
 msgstr "Yeni bir kЩsayol yarat"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 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:689
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "гevrimiГi ГalЩЧ"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "гevrimdЩЧЩ гalЩЧ"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 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-shell-view.c:1411
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 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
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution ГevrimdЩЧЩ ГalЩЧmak Эzere hazЩrlanЩyor."
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 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
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerel kayЩt kurulamadЩ -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views 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
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "Tamam"
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "GeГersiz ileti iГeriПi"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "Depo kabuПa kayЩt ettirilemedi"
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Genel hata"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Yeni bir kЩsayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Grup adЩ:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9701,173 +11502,161 @@ msgstr ""
 "KЩsayol ГubuПundan `%s' grubunu \n"
 "kaldЩrmak istiyor musunuz?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Silme"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
 msgstr "KЩsayol Grubunu Yeniden щsimlendir"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 msgid "Rename selected shortcut group to:"
 msgstr "SeГili kЩsayol grubunu yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "_KЭГЭk Simgeler"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "KЩsayollarЩ kЭГЭk simgeler olarak gЖster"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "_BЭyЭk Simgeler"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "KЩsayollarЩ bЭyЭk simgeler olarak gЖster"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "Yeni _Grup..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Yeni bir kЩsayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Bu Grubu Sil..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Bu kЩsayolu grubunu sil"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Bu Grubu Yeniden щsimlendir..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
 msgstr "Bu kЩsayol grubunu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "KЩsayol гubuПunu _Gizle"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "KЩsayol ГubuПunu gizle"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
 msgstr "KЩsayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 msgid "Rename selected shortcut to:"
 msgstr "SeГili kЩsayollarЩ yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "AГ"
-
-#: shell/e-shortcuts-view.c:474
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr "Bu kЩsayola baПlЩ dizini aГ"
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Yeni Pencerede AГ"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 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:479
-msgid "Rename"
-msgstr "Yeniden isimlendir"
-
-#: shell/e-shortcuts-view.c:479
+#: shell/e-shortcuts-view.c:383
 msgid "Rename this shortcut"
 msgstr "Bu kЩsayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu kЩsayolu kЩsayol ГubuПundan sil"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "KЩsayollarЩ kaydederken hata oldu."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, 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
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(isimsiz)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Hata yok"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Genel hata"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "AynЩ isimli bir dizin zaten var"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Belirtilen dizin tЭrЭ geГerli deПildir"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "G/г hatasЩ"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Dizin yaratmak iГin gerekli disk alanЩ yok"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Belirtilen dizin bulunamadЩ"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Fonksiyon desteklenmiyor"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "щЧlem desteklenmiyor"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "Bu kayЩtta belirtilen tip desteklenmiyor"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Belirtilen dizin bulunamadЩ"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d tamamlandЩ)"
 
@@ -9889,10 +11678,6 @@ msgstr "Makina:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Dizin adЩ:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Dizin tЭrЭ:"
@@ -9906,17 +11691,29 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "\"Aktar\" dЭПmesine tЩklayarak dosyalarЩ Evolution'a aktarЩn."
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Evolution Aktarma ProgramЩ"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Evolution Aktarma ProgramЩ"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Bir dosya seГin"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "Evolution dosya aktarma yardЩmcЩ programЩna hoЧgeldiniz\n"
@@ -9935,10 +11732,11 @@ msgid "Don't ask me again"
 msgstr "Tekrar sorma"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
-msgstr ""
+#, fuzzy
+msgid "Evolution can import data from the following files:"
+msgstr "E-posta alma va gЖnderme iГin Evolution bileЧeni"
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9960,7 +11758,7 @@ msgstr ""
 "Evolution geniЧ bir geliЧtirici grubu tarafЩndan hazЩrlanmaktadЩr. Sizlerin "
 "de desteПini bekliyoruz.\n"
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9968,24 +11766,29 @@ msgstr ""
 "TeЧekkЭrler\n"
 "Evolution Grubu\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 msgid "Cannot access the Evolution shell."
 msgstr "Evolution kabuПuna eriЧim yapЩlamadЩ."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Evolution kabuПuna eriЧim yapЩlamadЩ."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "AГЩlЩЧ ekranЩni gЖsterme"
 
-#: shell/main.c:216
+#: shell/main.c:229
 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:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parГalar sistemi baЧlatЩlamadЩ."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopyala"
 
@@ -10001,11 +11804,11 @@ msgstr "Yeni bir baПlantЩ yarat"
 msgid "Create new contact list"
 msgstr "Yeni bir baПlantЩ listesi yarat"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Kes"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "SeГimi kes"
 
@@ -10013,73 +11816,118 @@ msgstr "SeГimi kes"
 msgid "Delete selected contacts"
 msgstr "SeГili baПlantЩlarЩ sil"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Yeni baПlantЩ"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "New List"
 msgstr "Yeni liste"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "YapЩЧtЩr"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Panoyu yapЩЧtЩr"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "YazdЩrЩlacak olan baПlantЩlarЩ Жnizler"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "SeГili baПlantЩlarЩ yazdЩr"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "SeГili baПlantЩlarЩ sil"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Hepsini SeГ"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "TЭm baПlantЩklarЩ seГ"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "BaПlantЩya _ileti gЖnder..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "SeГili baПlantЩlarЩ sil"
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "BaПlantЩya ileti gЖnder"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "BaПlantЩyЩ baЧkasЩna gЖnder"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Dur"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "YЭklemeyi Durdur"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "E_ylemler"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "_Adres Defteri KaynaklarЩ..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_BaПlantЩ"
 
-#: ui/evolution-addressbook.xml.h:24
-msgid "_Contact Group"
-msgstr "_BaПlantЩ Grubu"
+#: ui/evolution-addressbook.xml.h:32
+#, fuzzy
+msgid "_Contact List"
+msgstr "_BaПlantЩ"
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_BaПlantЩlar..."
 
-#: 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
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_YazdЩr..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "VCard olarak kaydet"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "BaП_lantЩlarЩ ara"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "_Hepsini 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_AraГlar"
 
@@ -10089,112 +11937,130 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "Yeni bir tЭm gЭn olayЩ yarat"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Yeni bir randevu yarat"
+msgid "Create a New _Task"
+msgstr "Yeni bir gЖrev yarat"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Yeni bir randevu yarat"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "GЭn"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Bu randevuyu sil"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Git"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Zamanda geriye git"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Zamanda ileri git"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "_Tarihe Git"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Belirli bir tarihe git"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "чimdiki zamana git"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "BugЭne Git"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+msgid "Month"
+msgstr "Ay"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Yeni Randevu"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Yeni GЖrev"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "YazdЩrЩlacak olan takvimi Жnizler"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Takvimi yazdЩr"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Bu Takvimi YazdЩr"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "YazdЩrma ж_nizlemesi"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "щstenen Bilgiler"
+msgid "Print this calendar"
+msgstr "Bu Takvimi YazdЩr"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "1 gЭn gЖster"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "1 ay gЖster"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "1 hafta gЖster"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "гalЩЧma gЭnlerini gЖster"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "г_alЩЧma haftasЩ"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "Hafta"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "_Randevu"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "E-posta AyarlarЩ..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "_GЭn"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "_Ay"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "щstenen Bilgiler"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "_Hafta"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_GЖrev"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10205,15 +12071,16 @@ msgid "Close"
 msgstr "Kapat"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Bu randevuyu kapat"
+#, fuzzy
+msgid "Close this item"
+msgstr "Bu ЖПeyi sil"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Bu randevuyu sil"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Bu ЖПeyi sil"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Ana araГ ГubuПu"
 
@@ -10221,114 +12088,84 @@ 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-tasks.xml.h:11
-msgid "Print Pre_view"
-msgstr "YazdЩrma ж_nizlemesi"
-
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print S_etup"
-msgstr "YazdЩrma _AyarlarЩ"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 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-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "YazdЩr..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Kaydet"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Kaydet ve Kapat"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
-msgstr "Randevuyu kaydet ve diyalog penceresini kapat"
+#: ui/evolution-comp-editor.xml.h:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "BaПlantЩyЩ kaydet ve diyalog penceresini kapat"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Bu ЖПeyi diske kaydet"
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "GЭncel yazЩcЩ iГin sayfa ayarlarЩnЩ yap"
-
-#: ui/evolution-comp-editor.xml.h:19
-msgid "_Action"
-msgstr "E_ylemler"
-
-#: 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Dosya"
 
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Bu ЖПeyi sil"
-
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete..."
-msgstr "Sil..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "YardЩm"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "_ZarfЩ YazdЩr..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "_FarklЩ Kaydet..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "BaПlantЩyЩ kaydet ve diyalog penceresini kapat"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "_BaПlantЩyЩ baЧkasЩna gЖnder..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "гevrimiГi yardЩma git"
-
-#: ui/evolution-contact-editor.xml.h:13
-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:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Kaydet"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Bu ЖПeyi sil"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Sil..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, 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:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "_BaПlantЩyЩ baЧkasЩna gЖnder..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "BaПlantЩya _ileti gЖnder..."
@@ -10337,19 +12174,19 @@ msgstr "BaПlantЩya _ileti gЖnder..."
 msgid "Cancel Mee_ting"
 msgstr "ToplantЩyЩ щ_ptal Et"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "Bu ЖПe iГin toplantЩyЩ iptal et"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "i_Calendar Olarak YЖnlendir"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Bu ЖПeyi ileti ile yЖnlendir"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr "Son toplantЩ bilgisini al"
 
@@ -10361,15 +12198,10 @@ msgstr "T_oplantЩyЩ Tazele"
 msgid "Schedule _Meeting"
 msgstr "ToplantЩ ZamanЩ DЭzenle"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 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:40
-msgid "_Actions"
-msgstr "E_ylemler"
-
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customise My Evolution"
 msgstr "Evolution'Щ жzelleЧtir"
@@ -10383,67 +12215,64 @@ msgid "Cancel the current mail operation"
 msgstr "чimdiki e-posta iЧlemini iptal et"
 
 #: ui/evolution-mail-global.xml.h:3
-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
+#: ui/evolution-mail-global.xml.h:4
 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:6
+#: ui/evolution-mail-global.xml.h:5
 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:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "Sanal dizin tanЩmlarЩ oluЧtur/dЭzenle"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "гЖpЭ _BoЧalt"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "ParolalarЩ _Unut"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 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:11
-msgid "Manage _Subscriptions..."
-msgstr "эyelikleri _DЭzenle..."
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "щleti"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "щletiyi dЭzenlemek iГin bir pencere aГ"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 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:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Al / GЖnder"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Kuyruktaki iletileri gЖnder ve yeni iletileri al"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr "щleti Жnizleme penceresini gЖster"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 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:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "Sanal Dizin _DЭzenleyici..."
 
@@ -10467,89 +12296,100 @@ msgstr "жnizleme _Panosu"
 msgid "_Send / Receive"
 msgstr "_GЖnder / Al"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "\"%s\" dizinine Эye olunuyor"
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Bu dizinin Жzelliklerini deПiЧtir"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "SeГili iletileri kopyala"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Kes"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "SeГili iletileri kes"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "SeГili щletileri Gizle"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "_Silenen щletileri Gizle"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "_Okunan щletileri Gizle"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Silinen iletileri Эzerine Гizgi Гekmek yerine gizle"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "_TЭmЭnЭ OkunmuЧ Olarak щЧaretle"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "TЭm gЖrЭnen iletileri okunmuЧ olarak iЧaretle"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "щletiyi panoya yapЩЧtЩr"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 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:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "TЭmЭnЭ _SeГ"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Konumu _SeГ"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "TЭm gЖrЭnen iletileri seГ"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "_TЭmЭnЭ GЖster"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "_Okunan щletileri Gizle"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "GeГici olarak gizlenmiЧ iletileri gЖster"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "OkunmuЧ iletileri geГici olarak gizle"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "SeГili iletileri geГici olarak gizle"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "KonumlandЩrЩlan щleti listesi"
 
@@ -10557,7 +12397,7 @@ msgstr "KonumlandЩrЩlan щleti listesi"
 msgid "_Expunge"
 msgstr "_Sil"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Dizin"
 
@@ -10565,11 +12405,11 @@ msgstr "_Dizin"
 msgid "_Invert Selection"
 msgstr "S_eГimi Tersine гevir"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "ж_zellikler..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
 msgstr "_KonumlandЩrЩlan щleti Listesi"
 
@@ -10798,7 +12638,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "SeГilen iletiyi dЭzenleyicide yeniden gЖndermek Эzere aГ"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "YazdЩrЩlacak olan iletiyi Жnizler"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10820,39 +12661,35 @@ msgstr "щletiyi YazdЩr"
 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:65
-msgid "Print Preview..."
-msgstr "YazdЩrma жnizlemesi..."
-
-#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Print this message"
 msgstr "щletiyi YazdЩr"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Cevapla"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "TЭmЭne cevapla"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "щle_ti Ara"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "щletiyi bir dosyaya kaydet"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr "GЖrЭntЭlenen ileti iГinde bir metin ara"
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "GЭncel yazЩcЩ iГin sayfa ayarlarЩnЩ yap"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "щleti _KaynaПЩnЩ GЖster"
@@ -10893,67 +12730,51 @@ msgstr "_AlЩcЩlara GЖre VFolder..."
 msgid "VFolder on _Subject..."
 msgstr "_Konuya GЖre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Filtreleri Uygula"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr "Dizine _Kopyala"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "щ_letiden Bir Filtre Yarat"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr "щletiyi _YЖnlendir"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr "щleti _GЖrЭnЭmЭ"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "Dizine _TaЧЩ"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr "Normal _GЖsterim"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "щ_letiyi AГ "
 
-#: 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:5
 msgid "Close this window"
 msgstr "Bu pencereyi kapat"
 
-#: 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:11
-msgid "Customize"
-msgstr "ж_zelleЧtir"
-
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Kapat"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_GЖster"
 
@@ -11018,11 +12839,6 @@ msgstr "S/MIME чifreleme"
 msgid "S/MIME Sign"
 msgstr "S/MIME щmza"
 
-#: 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:20
 msgid "Save As"
 msgstr "FarklЩ Kaydet"
@@ -11151,7 +12967,7 @@ msgstr "_YanЩtla AlanЩ"
 msgid "_Security"
 msgstr "_GЭvenlik"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_YardЩm"
 
@@ -11184,14 +13000,29 @@ msgid "Unsubscribe"
 msgstr "эyelikten ГЩk"
 
 #: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Assign Task"
+msgstr "GЖrevlendirildi"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "GЖrevi щptal Et"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
-msgstr "GЖrevi DaПЩt"
+#: ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Cancel this task"
+msgstr "GЖrevi щptal Et"
 
 #: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Obtain the latest task information"
+msgstr "Son toplantЩ bilgisini al"
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "GЖrevi _Tazele"
 
@@ -11199,40 +13030,28 @@ msgstr "GЖrevi _Tazele"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "SeГili gЖrevi kopyala"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Yeni bir gЖrev yarat"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "SeГili GЖrevi Sil"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "SeГilen gЖrevleri sil"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr "Yeni GЖrev"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Panodan gЖrevi yapЩЧtЩr"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr "GЖrevi farklЩ kaydet"
-
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "E-posta AyarlarЩ..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_GЖrev"
 
@@ -11264,174 +13083,156 @@ msgstr "KЩsayol ГubuПunda bu dizine bir baПlantЩ oluЧtur"
 msgid "Create a new folder"
 msgstr "Yeni bir dizin yarat"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
 msgstr "Bu dizini sil"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "FarklЩ bir dizin gЖster"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "гЩ_k"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr "Evolution _SSS"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "Evolution _Penceresi"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Programdan ГЩk"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "_BaЧlangЩГ"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Harici dosya biГimini aktar"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "Bu dizini baЧka bir yere taЧЩ"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "Y_eni Pencerede AГ"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Bu dizini yeni bir pencerede aГ"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Evolution hakkЩnda bilgi ver"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Hata Raporu GЖnder"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "_Hata Raporu GЖnder"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "_Bug Buddy kullanarak hata raporu gЖnder."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "AГ/kapat"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Dizin ГubuПunu gЖster/gizle"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "KЩsayol ГubuПunu gЖster/gizle"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "гevrimiГi/ГevrimdЩЧЩ ГalЩЧ."
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr "_BaПlantЩ YЖneticisini Kullanarak"
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr "_Takvim Kullanarak"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "_PostalayЩcЩ Kullanarak"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "SeГili dizini gЖster"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Evolution HakkЩnda..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Randevu"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_BaПlantЩ (FIXME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "_Dizin гubuПu"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "Dizine _Git..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "Dosya _ekle..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "щ_ndex"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "щ_letiyi postala"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_TaЧЩ..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Yeni Dizin"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "Y_eniden щsimlendir..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "_KЩsayol гubuПu"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_KЩsayol гubuПu"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "_GЖrev (FIXME)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "гe_vrimdЩЧЩ гalЩЧ"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+#, fuzzy
+msgid "Change the settings for the summary"
 msgstr "Evolution iГin ГeЧitli ayarlar yapЩlmasЩnЩ saПlar"
 
 #: ui/my-evolution.xml.h:4
-msgid "_My Evolution Settings..."
-msgstr "Evolution AyarlarЩ..."
+#, fuzzy
+msgid "Print summary"
+msgstr "щleti Жzeti"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Oku"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "E-posta AyarlarЩ..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -11465,6 +13266,30 @@ msgstr "щletiler"
 msgid "With Category"
 msgstr "Kategori"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Bir dosya seГin"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "BЖlЭmler:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zaman Dilimi: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11472,10 +13297,6 @@ msgstr "Kategori"
 msgid "%A, %B %d, %Y"
 msgstr "%d %B %A, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "MeЧgul"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Ofiste DeПil"
@@ -11548,7 +13369,7 @@ msgstr "TЭm KatЩlЩmcЩlar"
 msgid "_Current View"
 msgstr "ч_imdiki GЖrЭnЭm"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "GЖrЭnЭmleri TanЩmla"
 
@@ -11558,19 +13379,20 @@ msgstr "GЖrЭnЭmleri TanЩmla"
 msgid "MTWTFSS"
 msgstr "PSгPCCP"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "чimdi"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "BugЭn"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "Tamam"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "GЭn %s biГiminde girilmelidir."
@@ -11659,35 +13481,33 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "щletiЧim DЭzenleyici"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "AramayЩ Kaydet"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "GeliЧmiЧ Arama"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "AramayЩ Kaydet"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Takvim"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "TЭmЭnЭ GЖster"
 
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "GeliЧmiЧ..."
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Bilgi"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "UyarЩ"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Hata"
@@ -11705,10 +13525,15 @@ msgstr "щleti"
 msgid "Don't show this message again."
 msgstr "Bu mesajЩ bir daha gЖsterme."
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_Ara"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "BaПlantЩ DN:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "KiЧisel Adres Defteri Sunucusu"
@@ -11730,6 +13555,323 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo baЧlatЩlamadЩ"
 
 #, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "жzet"
+
+#~ msgid "LDAP Server"
+#~ msgstr "LDAP Sunucusu"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Bilinmeyen adres defteri tЭrЭ"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "HiГbiri (anonim kipi)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Bilinmeyen kimlik denetim tЭrЭ"
+
+#~ msgid "Subtree"
+#~ msgstr "Alt AПaГ"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Bilinmeyen saha tЭrЭ"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "Bind DN yardЩm metni"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "Makine yardЩm metni"
+
+#~ msgid "Root DN:"
+#~ msgstr "KЖk DN:"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "Root DN yardЩm metni"
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "Port yardЩm metni"
+
+#~ msgid "Authentication:"
+#~ msgstr "Kimlik Denetimi:"
+
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "GeliЧmiЧ LDAP SeГenekleri"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "Yol yardЩm metni"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "EПer yoksa yol oluЧtur."
+
+#~ 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."
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "щsim yardЩm metni"
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "AГЩklama yardЩm metni"
+
+#~ msgid "Name"
+#~ msgstr "щsim"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "%s iГin parolayЩ girin"
+
+#~ msgid "Category contains"
+#~ msgstr "Kategori iГeriПi"
+
+#~ msgid "Select name from _folder:"
+#~ msgstr "_Dizinden isim seГin:"
+
+#~ msgid "USA"
+#~ msgstr "ABD"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "щptal Edildi"
+
+#~ msgid "Transparent"
+#~ msgstr "чeffaf"
+
+#~ msgid "Opaque"
+#~ msgstr "Opak"
+
+#~ 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."
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "чeffaflЩk deПeri 'чeffaf', 'Opak' ya da 'HiГbiri' olmalЩdЩr."
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Alarm penceresi gЖrЭndЭПЭnde biple."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Takvim Tercihleri"
+
+#~ msgid "Colors for Tasks"
+#~ msgstr "GЖrevler iГin Renkler"
+
+#~ msgid "Date Navigator"
+#~ msgstr "GЭn Gezgincisi"
+
+#~ msgid "Defaults"
+#~ msgstr "жntanЩmlЩlar"
+
+#~ msgid "Notification Options"
+#~ msgstr "Bildirim SeГenekleri"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "TЭm randevularЩmЩ hatЩrlat"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "dakika Жnce (oluЧmadan)."
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "GЖrevi DaПЩt"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Yok"
+
+#~ msgid "Task"
+#~ msgstr "GЖrev"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "_Biten %:"
+
+#~ msgid "Transparency"
+#~ msgstr "чeffaflЩk"
+
+#~ msgid "This is an event that can be added to your calendar."
+#~ msgstr "Bu takvime eklenebilen bir olaydЩr."
+
+#~ msgid "This is a meeting request."
+#~ msgstr "Bu bir toplantЩ isteПidir."
+
+#~ msgid "This is one or more additions to a current meeting."
+#~ msgstr "Bu Чimdiki toplantЩya bir ya da bir kaГ eklemedir."
+
+#~ msgid "This is a request for the latest event information."
+#~ msgstr "Bu, son olay bilgisi iГin bir istektir."
+
+#~ msgid "This is an event cancellation."
+#~ msgstr "Bu bir olay iptalidir."
+
+#~ msgid "The message is not understandable."
+#~ msgstr "Bu ileti anlaЧЩlЩr deПil."
+
+#~ msgid "This is an task that can be added to your calendar."
+#~ msgstr "Bu, takvime eklenebilen bir gЖrevdir."
+
+#~ msgid "This is a task request."
+#~ msgstr "Bu bir gЖrev isteПidir."
+
+#~ msgid "This is a reply to a task request."
+#~ msgstr "Bu bir gЖrev isteПine cevaptЩr."
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Bu iletinin biГimi dЭzgЭn deПil."
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Bu iletide desteklenmeyen bilgiler var."
+
+#~ msgid "All"
+#~ msgstr "TЭmЭ"
+
+#~ msgid "Edit"
+#~ msgstr "DЭzenle"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "KaydЩ vFolder olarak kaydet"
+
+#~ msgid "Resend"
+#~ msgstr "Yeniden GЖnder"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Evolution Hesap YЖneticisi"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "%s tarihinde, %s dedi ki:"
+
+#~ msgid "Receiving"
+#~ msgstr "AlЩnЩyor"
+
+#~ msgid "Store"
+#~ msgstr "Sakla"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Bununla baЧlayan dizinleri gЖster:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "\"%s\" iГin depo alЩnЩyor"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Evolution AyarlarЩ..."
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%d %B %A"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "щletiyi yazdЩrЩlmasЩnda hata"
+
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Yeni baПlantЩ"
+
+#~ msgid "_Contact Group"
+#~ msgstr "_BaПlantЩ Grubu"
+
+#~ msgid "Go to present time"
+#~ msgstr "чimdiki zamana git"
+
+#~ msgid "W_ork Week"
+#~ msgstr "г_alЩЧma haftasЩ"
+
+#~ msgid "_Day"
+#~ msgstr "_GЭn"
+
+#~ msgid "_Month"
+#~ msgstr "_Ay"
+
+#~ msgid "_Week"
+#~ msgstr "_Hafta"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Bu randevuyu kapat"
+
+#~ msgid "Print S_etup"
+#~ msgstr "YazdЩrma _AyarlarЩ"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Randevuyu kaydet ve diyalog penceresini kapat"
+
+#~ msgid "_Action"
+#~ msgstr "E_ylemler"
+
+#~ msgid "Help"
+#~ msgstr "YardЩm"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "_BaПlantЩyЩ baЧkasЩna gЖnder..."
+
+#~ msgid "See online help"
+#~ msgstr "гevrimiГi yardЩma git"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "эyelikleri _DЭzenle..."
+
+#~ msgid "Show _All"
+#~ msgstr "_TЭmЭnЭ GЖster"
+
+#~ msgid "Print Preview..."
+#~ msgstr "YazdЩrma жnizlemesi..."
+
+#~ msgid "_Re-send Message"
+#~ msgstr "щ_letiyi Yeniden GЖnder"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "_AraГ гubuklarЩnЩ жzelleЧtir..."
+
+#~ msgid "Customize"
+#~ msgstr "ж_zelleЧtir"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "AraГ ГubuklarЩnЩ ЖzelleЧtir"
+
+#~ msgid "Delegate Task"
+#~ msgstr "GЖrevi DaПЩt"
+
+#~ msgid "Save task as something else"
+#~ msgstr "GЖrevi farklЩ kaydet"
+
+#~ msgid "Getting _Started"
+#~ msgstr "_BaЧlangЩГ"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "_BaПlantЩ YЖneticisini Kullanarak"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "_Takvim Kullanarak"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "_PostalayЩcЩ Kullanarak"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Randevu"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_BaПlantЩ (FIXME)"
+
+#~ msgid "_Index"
+#~ msgstr "щ_ndex"
+
+#~ msgid "_Mail message"
+#~ msgstr "щ_letiyi postala"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_GЖrev (FIXME)"
+
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Evolution AyarlarЩ..."
+
+#, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Tercihleri deПiЧtir"
 
@@ -11746,9 +13888,6 @@ msgstr "init_bonobo(): Bonobo baЧlatЩlamadЩ"
 #~ msgid "_Company:"
 #~ msgstr "ч_irket:"
 
-#~ msgid "(none)"
-#~ msgstr "(hiГbiri)"
-
 #, fuzzy
 #~ msgid ""
 #~ "Notification about your journal entry starting on %s and ending on %s"
@@ -11784,72 +13923,12 @@ msgstr "init_bonobo(): Bonobo baЧlatЩlamadЩ"
 #~ 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"
 
@@ -11874,9 +13953,6 @@ msgstr "init_bonobo(): Bonobo baЧlatЩlamadЩ"
 #~ 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"
 
@@ -11898,18 +13974,15 @@ msgstr "init_bonobo(): Bonobo baЧlatЩlamadЩ"
 #~ 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>"
+#~ "-----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>"
+#~ "-----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>"
@@ -11923,12 +13996,6 @@ msgstr "init_bonobo(): Bonobo baЧlatЩlamadЩ"
 #~ 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"
 
@@ -11941,9 +14008,6 @@ msgstr "init_bonobo(): Bonobo baЧlatЩlamadЩ"
 #~ msgid "Save calendar as something else"
 #~ msgstr "Takvimi farklЩ kaydet"
 
-#~ msgid "Week"
-#~ msgstr "Hafta"
-
 #~ msgid "_Open Calendar"
 #~ msgstr "_Takvimi AГ"
 
diff --git a/po/uk.po b/po/uk.po
index 622fbcf916..cf9ad74a8a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Yuri Syrota <rasta@renome.rovno.ua>, 2000.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -22,11 +23,11 @@ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Картка: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -34,7 +35,7 @@ msgstr ""
 "\n"
 "╤м'я: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -42,31 +43,31 @@ msgstr ""
 "\n"
 "  Преф╕кс:    "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +75,7 @@ msgstr ""
 "\n"
 "Дата народження: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +83,7 @@ msgstr ""
 "\n"
 "Адреса:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,13 +91,13 @@ msgstr ""
 "\n"
 "  Поштова скринька: "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -104,7 +105,7 @@ msgstr ""
 "\n"
 "  Вулиця:      "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -112,7 +113,7 @@ msgstr ""
 "\n"
 "  М╕сто:       "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -120,7 +121,7 @@ msgstr ""
 "\n"
 "  Ре╜╕он:      "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -128,7 +129,7 @@ msgstr ""
 "\n"
 "  ╤ндекс:      "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -136,13 +137,13 @@ msgstr ""
 "\n"
 "  Кра╖на:      "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -150,7 +151,7 @@ msgstr ""
 "\n"
 "Телефони:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -158,7 +159,7 @@ msgstr ""
 "\n"
 "Телефон:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -166,7 +167,7 @@ msgstr ""
 "\n"
 "Електронна пошта:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -174,7 +175,7 @@ msgstr ""
 "\n"
 "Електронна адреса: "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -182,7 +183,7 @@ msgstr ""
 "\n"
 "Поштова програма: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -190,7 +191,7 @@ msgstr ""
 "\n"
 "Часовий пояс: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -198,7 +199,7 @@ msgstr ""
 "\n"
 "Розташування: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -206,7 +207,7 @@ msgstr ""
 "\n"
 "Помада: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -214,7 +215,7 @@ msgstr ""
 "\n"
 "Орган╕зац╕я: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -222,31 +223,31 @@ msgstr ""
 "\n"
 "  ╤м'я:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -254,7 +255,7 @@ msgstr ""
 "\n"
 "Категор╕╖: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -272,13 +273,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -300,8 +301,8 @@ msgstr "Введ╕ть пароль для %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -316,20 +317,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: 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:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -381,203 +382,211 @@ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+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-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr "Помилка завантаження файлу: %s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Нев╕домий тип авторизац╕╖"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Новий контакт"
 
-#: addressbook/gui/component/addressbook-config.c:177
+#: addressbook/gui/component/addressbook-component.c:386
 #, fuzzy
-msgid "Base"
-msgstr "Вставити"
+msgid "New _Contact"
+msgstr "Новий контакт"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Новий контакт"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-component.c:387
 #, fuzzy
-msgid "Subtree"
-msgstr "Джерело"
+msgid "New Contact _List"
+msgstr "Новий контакт"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Виправити адресну книгу"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+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.glade.h:3
+msgid "Add Addressbook"
+msgstr "Додати адресну книгу"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "Комп'ютер:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Джерело адресно╖ книги"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Додатково..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#, fuzzy
+msgid "Base"
+msgstr "Вставити"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Вставити"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Порт:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "Стерти"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
+msgstr "Серверне пов╕домлення:"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Аутенф╕кац╕я:"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Серверне пов╕домлення:"
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "Вибрати назви"
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
-msgstr "Шлях:"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Ндл"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 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.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Джерело адресно╖ книги"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "Електронна адреса м╕стить"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "Додати"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "Редагування"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid "_My server requires authentication"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Порт:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Серверне пов╕домлення:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "╤нш╕ контакти"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "Введ╕ть пароль для %s"
+#: addressbook/gui/component/addressbook.c:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Введ╕ть пароль NNTP для %s@%s"
+
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Автенф╕кац╕я"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "Електронна адреса:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Пароль"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Не вдалося в╕дкрити адресну книгу"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 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
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -585,48 +594,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 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
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Будь-яке поле м╕стить"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "╤м'я м╕стить"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "Електронна адреса м╕стить"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "╤м'я м╕стить"
+msgid "Category is"
+msgstr "Категор╕╖"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Додатково..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Категор╕я:"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "URI теки, що буде в╕дображено переглядачем"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Без назви)"
+
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "Е-пошта 3"
 
@@ -650,19 +684,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "Виправити адресну книгу"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Виправлення контактно╖ ╕нформац╕╖"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Додати до контакт╕в"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Електронна адреса:"
@@ -685,13 +719,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c: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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Видалити"
 
@@ -704,37 +735,56 @@ msgstr "Видалити все"
 msgid "Send HTML Mail?"
 msgstr "Sendmail"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "╤нш╕ контакти"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Адресати пов╕домлення"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "м╕стить"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Вибрати назви"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "Контакт"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "Вибер╕ть назву з списку:"
+msgid "F_ind"
+msgstr "Знайти"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "Вибрати назви"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, 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/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "Тека"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Адресати пов╕домлення"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -749,8 +799,8 @@ 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Категор╕╖..."
 
@@ -759,16 +809,16 @@ msgid "Contact Editor"
 msgstr "Редактор контакт╕в"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Подробиц╕"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
-msgstr ""
+#, fuzzy
+msgid "File A_s:"
+msgstr "Файл"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Загальне"
 
@@ -793,239 +843,1233 @@ msgstr "Типи телефон╕в"
 msgid "Wants to receive _HTML mail"
 msgstr "Хоче отримувати листи в HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Адреса стор╕нки WWW:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "Адреса..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "╤м'я пом╕чника:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "Дата народження:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "Контакти..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "Стерти"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "В╕дд╕л:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "Повне ╕м'я..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "Домашня"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "Посада:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "╤м'я кер╕вника:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "Моб╕льний телефон"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "Пр╕звисько:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "Оф╕с:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "Профес╕я:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "Це поштова адреса"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Адреса стор╕нки WWW:"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "Пом╕чник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Робоча"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Робоча 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Робочий факс"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Авто"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Компан╕я"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Домашня"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Домашня 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Домашн╕й факс"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Моб╕льний"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "╤нша"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "╤нший факс"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Пейджер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Первинний"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "Рад╕о"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Швидке додавання контакту"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Виправлення повного ╕мен╕"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Повне ╕м'я"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "Е-пошта"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Адреса _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Пом╕чник"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Автовиб╕р"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Ор╕╓нтац╕я"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+msgid "Austria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "Заголовок"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Розм╕р"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "В╕дсилання"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Е-пошта"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Канада"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Канада"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Перев╕рка адреси"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Файл"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+msgid "China"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Кольори"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Коп╕ювання"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "Кра╖на:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Ф╕нлянд╕я"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "США"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "В╕дм╕нено"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "тиждень"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Ф╕нлянд╕я"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Канада"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "дп"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Загальне"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Е-пошта"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+msgid "Honduras"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Нед╕ля"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Низький"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Низький"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+msgid "Liberia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Пошук"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Е-пошта"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Е-пошта"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Е-пошта"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Поля"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Понед╕лок"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Понед╕лок"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Моб╕льний"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Кер╕вник"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Нова пошта"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Вибрати г╕лку"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Новий контакт"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Нова пошта"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Високий"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "Високий"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "хвилина"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "зараз"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Вставити"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Канада"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Пап╕р"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Ф╕нлянд╕я"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Книжна"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "п╕сля"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Розд╕ли:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Канада"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Моб╕льний"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Загальне"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "Планування зустр╕ч╕"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Звичайний"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "В╕дправити"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Ндл"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Пр╕звисько"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Ф╕нлянд╕я"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "В╕дправник"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Рад╕о"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Завдання"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Ф╕нлянд╕я"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "До"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "сьогодн╕"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Втр"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Завдання"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Канада"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Надрукувати пов╕домлення"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Вибрати назви"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+msgid "Yemen"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "Адреса:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "М╕сто:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "А/С:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "Штат/область:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "╤ндекс:"
 
@@ -1117,6 +2161,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Видалити"
@@ -1127,7 +2172,7 @@ msgid "contact-list-editor"
 msgstr "Редактор контакт╕в"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Редактор контакт╕в"
@@ -1137,7 +2182,7 @@ 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
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1159,25 +2204,31 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "╤нш╕ контакти"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "╤нш╕ контакти"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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:5
 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:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "Удосконалений пошук"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Пошук"
 
@@ -1289,42 +2340,52 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 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:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "В╕дкрити"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Переслати як"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Друкувати"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "Надрукувати конверт"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Стерти"
 
@@ -1341,7 +2402,8 @@ msgid "Success"
 msgstr "Джерела"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Нев╕дома помилка"
 
@@ -1350,7 +2412,7 @@ msgstr "Нев╕дома помилка"
 msgid "Repository offline"
 msgstr "Перенесення"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr ""
 
@@ -1369,8 +2431,11 @@ msgid "Protocol not supported"
 msgstr "Операц╕я не п╕дтриму╓ться"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "В╕дм╕нено"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1399,136 +2464,136 @@ msgid "Error removing list"
 msgstr "Помилка завантаження %s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr "Помилка зчитування файлу пошти: %s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Клацн╕ть тут щоб додати контакт *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 #, fuzzy
 msgid "File As"
 msgstr "Файл"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "Е-пошта"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Первинний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Телефлн пом╕чника"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Робочий телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Телефон компан╕╖"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Домашн╕й телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Орган╕зац╕я"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Робоча адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Домашня адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Моб╕льний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Автомоб╕льний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Робочий телеофн 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Домашн╕й телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "╤нший телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "╤нша адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Сайт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "В╕дд╕л"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Оф╕с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 #, fuzzy
 msgid "Title"
 msgstr "Титул:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Профес╕я"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Кер╕вник"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Пр╕звисько"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 #, fuzzy
 msgid "Spouse"
 msgstr "Джерело"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Прим╕тки"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Нема╓"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "Завантаження календаря..."
@@ -1721,6 +2786,23 @@ msgstr "Ширина:"
 msgid "_Font..."
 msgstr "Шрифт..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Надрукувати календар"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Надрукувати календар"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Надрукувати конверт"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1882,7 +2964,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
@@ -1892,149 +2974,140 @@ msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 msgid "Could not create the alarm notify service factory"
 msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %d %B %Y"
 
-#: calendar/gui/calendar-commands.c:586
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/calendar-commands.c:604
 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/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr ""
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr ""
 
-#: 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"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Високий"
 
-#: 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
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "Звичайний"
 
-#: 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
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Низький"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "тиждень"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Зайнятий"
 
-#: 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
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Не розпочато"
 
-#: 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
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 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
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Завершено"
 
-#: 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
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2045,27 +3118,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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 "Нема╓"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2075,43 +3128,50 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значення в╕дсотка ма╓ бути м╕ж 0 та 100, включно"
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Невизначено"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr ""
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "Нема╓"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 #, fuzzy
 msgid "Recurring"
 msgstr "Повторення"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Так"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Н╕"
 
@@ -2135,30 +3195,87 @@ msgstr "Тиждень"
 msgid "Month View"
 msgstr "М╕сяць"
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "Зведення м╕стить"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "Опис:"
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "Коментар м╕стить"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Календар"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Завдання"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Ф╕льтр списку розсилки"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Створити нову зустр╕ч"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Нова зустр╕ч"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Створити нову завдання"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Нове завдання"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URI, який в╕добразить календар"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Звуков╕ си╜нали"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Адресати пов╕домлення"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Параметри в╕дображення"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2209,121 +3326,127 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "Т╕ло"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr " 1 день"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "Тиждень"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr "Показати 1 тиждень"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "24 години"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 година"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d хвилин"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr "10 хвилин"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "В╕д╕слати"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " 1 секунда"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: 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.c:383
 #: 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.c:387
 #: 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.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Запустити програму"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr " перед початком зустр╕ч╕"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr " п╕сля початку зустр╕ч╕"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr " перед к╕нцем зустр╕ч╕"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Зведення:"
 
@@ -2332,12 +3455,11 @@ msgstr "Зведення:"
 msgid "_Options..."
 msgstr "Параметри"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "п╕сля"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "перед"
 
@@ -2356,7 +3478,7 @@ msgstr "к╕нець зустр╕ч╕"
 msgid "hour(s)"
 msgstr "година"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 #, fuzzy
 msgid "minute(s)"
 msgstr "хвилина"
@@ -2374,202 +3496,227 @@ msgid "10 minutes"
 msgstr "10 хвилин"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 годин (дп/пп)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 години"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 хвилин"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "Установки пошти..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
+msgid "Color for tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-msgid "Calendar"
-msgstr "Календар"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Створити нову зустр╕ч"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "Параметри календаря"
+#, fuzzy
+msgid "Days"
+msgstr "День"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Перший день тижня:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "П'ятниця"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+#, fuzzy
+msgid "Hours"
+msgstr "Комп'ютер:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
-msgstr ""
+#, fuzzy
+msgid "Minutes"
+msgstr "хвилина"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Понед╕лок"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "Defaults"
-msgstr "Подробиц╕"
+msgid "O_verdue tasks:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-#, fuzzy
-msgid "Display"
-msgstr "День"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "Субота"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "К╕нець дня:"
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "Показати час завершення зустр╕чей"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "Перший день тижня:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Показати номера тижн╕в"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Птн"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "Початок дня:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "П'ятниця"
+#, fuzzy
+msgid "Su_n"
+msgstr "Ндл"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Нед╕ля"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "Пнд"
+#, fuzzy
+msgid "T_hu"
+msgstr "Чтв"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Понед╕лок"
+#, fuzzy
+msgid "T_ue"
+msgstr "Втр"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
+msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Четвер"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Нагадувати про вс╕ зустр╕ч╕"
+#, fuzzy
+msgid "Time"
+msgstr "Титул:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"Часовий пояс: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "Сбт"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Розд╕лювач╕ часу:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "Субота"
+msgid "Time format:"
+msgstr "Формат часу:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#, fuzzy
-msgid "Show appointment end times in week and month views"
-msgstr "Показати час завершення зустр╕чей"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "В╕второк"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Показати номера тижн╕в"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Середа"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "Початок дня:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "Робочий тиждень"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "Ндл"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 годин (дп/пп)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Нед╕ля"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 години"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "Завдання"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "Чтв"
+#, fuzzy
+msgid "_Display"
+msgstr "День"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Четвер"
+#, fuzzy
+msgid "_End of day:"
+msgstr "К╕нець дня:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "Титул:"
+msgid "_Fri"
+msgstr "Птн"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Розд╕лювач╕ часу:"
+#, fuzzy
+msgid "_General"
+msgstr "Загальне"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Формат часу:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Прибрати стерт╕ пов╕домлення"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"Часовий пояс: "
+msgid "_Mon"
+msgstr "Пнд"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "Втр"
+#, fuzzy
+msgid "_Other"
+msgstr "╤нша"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "В╕второк"
+#, fuzzy
+msgid "_Sat"
+msgstr "Сбт"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "Срд"
+#, fuzzy
+msgid "_Task List"
+msgstr "Завдання"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Середа"
+#, fuzzy
+msgid "_Wed"
+msgstr "Срд"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
-msgid "Work Week"
-msgstr "Робочий тиждень"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr ""
+msgid "before the start of the appointment"
+msgstr " перед початком зустр╕ч╕"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2634,63 +3781,58 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Виправити зустр╕ч"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Зустр╕ч - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Завдання - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальний запис - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Нема╓ зведення"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Переписати файл?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2698,13 +3840,13 @@ msgstr ""
 "Файл з ц╕╓ю назвою вже ╕сну╓.\n"
 "Переписати його?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2750,44 +3892,35 @@ msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ви впевнен╕, що хочете стерти запис в журнал╕ \"%s\"?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Вибрати файл"
+msgid "Addressbook..."
+msgstr "Додати адресну книгу"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "Розд╕ли:"
+msgid "Delegate To:"
+msgstr "Стерто"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-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 ""
+msgid "Enter Delegate"
+msgstr "Стерто"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Зустр╕ч"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Нагадування"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Повторення"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "Скасувати зустр╕ч"
@@ -2796,174 +3929,189 @@ msgstr "Скасувати зустр╕ч"
 msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Зайнятий"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Класиф╕кац╕я"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+msgid "Con_fidential"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Дата й час"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "тиждень"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Особисте"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Публ╕чне"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Показати"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "Зведення:"
 
-#: 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
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "Час завершення:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, fuzzy
 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
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Стерто"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "Викону╓ться"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Потр╕бн╕ люди"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Потр╕бн╕ люди"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Потр╕бн╕ люди"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "В╕д╕слано"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Стерти..."
@@ -3007,20 +4155,19 @@ msgid "Role"
 msgstr "Моб╕льний"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 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 "Орган╕затор:"
@@ -3067,15 +4214,15 @@ msgstr "м╕сяць"
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 #, fuzzy
 msgid "occurrences"
 msgstr "Джерела"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Custom recurrence"
-msgstr "Без повторення"
+msgid "A_dd"
+msgstr "Додати"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3086,26 +4233,33 @@ 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Правило повторення"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Просте повторення"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Без повторення"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Зм╕нити"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Без повторення"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Просте повторення"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "в"
@@ -3148,167 +4302,163 @@ 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% завершення:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "Стерто"
+msgid "Date Completed:"
+msgstr "Дата виконання:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "Нема╓"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "Поступ"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Завдання"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "Пр╕оритет:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% завершення:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "Стан:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "Поступ"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Прив'язано"
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Опис:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Час початку:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "_Due Date:"
 msgstr "В╕дд╕л:"
 
-#: calendar/gui/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
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "Скоп╕ювати"
 
-#: calendar/gui/e-calendar-table.c: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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "Вставити"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Позначити як виконане"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Стерти це завдання"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Позначити як виконане"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Стерти завдання"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 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 "Си╜нали"
@@ -3343,23 +4493,23 @@ msgstr "Географ╕чне положення"
 msgid "Priority"
 msgstr "Пр╕оритет"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Дата початку"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Зведення"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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"
@@ -3371,156 +4521,262 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Нова щоденна под╕я"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "сьогодн╕"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "К╕нцева дата"
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Стерти цю зустр╕ч"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Зберегти поточний файл"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Стерти цей елемент"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, 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."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "Це поштова адреса"
+msgid "Meeting Information"
+msgstr "Нема╓ ╕нформац╕╖"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Скасувати зустр╕ч"
+
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Час завершення з╕брання:"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "Це поштова адреса"
+
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Пов╕домлення %s не знайдено."
+msgid "Meeting Reply"
+msgstr "Скасувати зустр╕ч"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Вибрати файл"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Виправити пов╕домлення"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "╤нформац╕я"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "Панель завдань"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "було перед"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "Завдання"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "В╕дпов╕сти"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "Схоже тека непоправно з╕псована."
+msgid "Task Cancellation"
+msgstr "Скасувати зустр╕ч"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Календарне пов╕домлення"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Нема╓ ╕нформац╕╖"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Нема╓ ╕нформац╕╖"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Попередн╓ пов╕домлення"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "Не вдалося поновити ваш календарний файл!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Дата виконання:"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Не вдалося створити календар в \"%s\""
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% завершення:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Дата в╕дсилання"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
@@ -3558,46 +4814,29 @@ msgstr ""
 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
+#: calendar/gui/e-tasks.c:349
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Не вдалося завантажити календар в \"%s\""
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод, необх╕дний для завантаження \"%s\", не п╕дтриму╓ться"
 
-#. 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
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Нова зустр╕ч..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "Не вдалося в╕дкрити теку \"%s\":\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод, необх╕дний для завантаження \"%s\", не п╕дтриму╓ться"
@@ -3624,46 +4863,46 @@ 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:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "March"
 msgstr "Пошук"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
 msgid "May"
 msgstr "Понед╕лок"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 #, fuzzy
 msgid "October"
 msgstr "╤нша"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "сьогодн╕"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3819,12 +5058,6 @@ msgstr "Птн"
 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:1815
 #, fuzzy
@@ -3861,9 +5094,8 @@ msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
@@ -3876,7 +5108,7 @@ msgstr "Надрукувати цей елемент"
 msgid "Print Setup"
 msgstr "Параметри друку"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "URI, який в╕добразить календар"
@@ -3913,6 +5145,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "НПВСЧПС"
 
+#: 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 ""
@@ -3974,7 +5302,7 @@ msgid "Unable to process spool folder"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
 #: camel/camel-filter-driver.c:667
-#, fuzzy
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Запис пов╕домлення %d з %d"
 
@@ -4015,7 +5343,7 @@ msgstr "Помилка збереження файлу: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Помилка збереження файлу: %s"
@@ -4042,12 +5370,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -4161,13 +5489,13 @@ 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
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Неможливо створити канал до GPG/PGP: %s"
@@ -4185,15 +5513,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr "Не вдалося створити тимчасовий файл: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4228,7 +5556,7 @@ msgid "Connection cancelled"
 msgstr "В╕дм╕нено"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4239,7 +5567,7 @@ msgstr "(нев╕домий хост)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "В╕дкрити календар"
@@ -4361,42 +5689,69 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Аутенф╕кац╕я:"
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Пароль"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Джерела"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Зб╕й запису в тимчасову поштову скриньку: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "Перев╕рка \"%s\""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4409,12 +5764,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4461,7 +5816,7 @@ msgstr "Переслане пов╕домлення %s"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4469,7 +5824,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4515,61 +5870,61 @@ msgstr ""
 "Неможливо отримати пов╕домлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь OK в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не вдалося створити каталог %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 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
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Збереження пов╕домлень"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: 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
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Збереження пов╕домлень"
@@ -4583,7 +5938,7 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr "Не вдалося створити каталог %s: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr ""
 
@@ -4592,7 +5947,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Теки"
 
@@ -4632,7 +5987,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "╤дентиф╕кац╕я не вимага╓ться"
@@ -4643,7 +5998,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -4655,12 +6010,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Нев╕рна тека \"%s\"."
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4751,7 +6106,7 @@ msgstr "В╕д╕слан╕ пов╕домлення"
 #: 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-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4765,7 +6120,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
@@ -4839,20 +6194,20 @@ msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 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-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4864,12 +6219,12 @@ msgstr ""
 "Неможливо отримати пов╕домлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
@@ -4918,13 +6273,13 @@ msgstr "Тека \"%s\" не порожня. Не стерто."
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing 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"
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 "Не вдалося в╕дкрити теку \"%s\":\n"
 "%s"
@@ -4936,25 +6291,22 @@ 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"
+msgid "Cannot summarize folder: %s: %s"
 msgstr "Не вдалося перейменувати теку \"%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:1516
+#: camel/providers/local/camel-spool-summary.c:931
 #, fuzzy
-msgid "Synchronising folder"
+msgid "Synchronizing 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"
+msgid "Could not open folder to summarize: %s: %s"
 msgstr ""
 "Не вдалося в╕дкрити теку \"%s\":\n"
 "%s"
@@ -5059,6 +6411,19 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Не вдалося перейменувати теку \"%s\": %s"
+
+#: 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 ""
+"Не вдалося в╕дкрити теку \"%s\":\n"
+"%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
@@ -5147,40 +6512,40 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Отримання пов╕домлення %d з %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Створити новий календар"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, fuzzy, c-format
-msgid "No message with uid %s"
-msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, fuzzy, c-format
-msgid "Retrieving POP message %d"
-msgstr "Отримання пов╕домлення %d з %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Не вдалося в╕д╕слати пов╕домлення: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, fuzzy, c-format
+msgid "No message with uid %s"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Отримання пов╕домлення %d з %d"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 #, fuzzy
 msgid "Message storage"
@@ -5196,7 +6561,7 @@ msgstr "Не видаляти пов╕домлення з сервера"
 msgid "Delete after %s day(s)"
 msgstr "Стерти завдання"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5276,7 +6641,7 @@ msgid "No such folder `%s'."
 msgstr "Нев╕рна тека \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5329,7 +6694,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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
@@ -5337,127 +6702,127 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Help message"
 msgstr "Надрукувати пов╕домлення"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 #, fuzzy
 msgid "Service ready"
 msgstr "Прибрати"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Не вказано паролю."
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "╤дентиф╕кац╕я не вимага╓ться"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 #, fuzzy
 msgid "Authentication required"
 msgstr "╤дентиф╕кац╕я не вимага╓ться"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Введ╕ть пароль NNTP для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5465,129 +6830,129 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "Сервер SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Достачання пошти SMTP через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr "Неможливо в╕д╕слати пов╕домлення: адреса в╕дправника не визначена."
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr "Неможливо в╕д╕слати пов╕домлення: адреса в╕дправника не в╕рна."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 #, fuzzy
 msgid "Sending message"
 msgstr "Стерти це пов╕домлення негайно"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "Неможливо в╕д╕слати пов╕домлення: не визначено отримувач╕в"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Перевищено час оч╕кування в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Помилка в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Автенф╕кац╕я"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Перевищено час оч╕кування в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Перевищено час оч╕кування в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Нев╕дома помилка: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5617,7 +6982,7 @@ msgid "%.1fG"
 msgstr "%.1fГ"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "долучення"
 
@@ -5650,52 +7015,52 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Клацн╕ть тут щоб викликати адресну книгу"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "В╕д:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "В╕дпов╕дати на:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5724,97 +7089,97 @@ msgid ""
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Попередження"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 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
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "В╕дкрити файл"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "Вставити текстовий файл..."
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "П╕дготувати пов╕домлення"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Не вдалось створити в╕кно конструктора."
 
@@ -5844,59 +7209,105 @@ msgstr "Адреса"
 msgid "calendar information"
 msgstr "Нема╓ ╕нформац╕╖"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "м╕стить"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "не м╕стить"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "Коментар м╕стить"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "╤м'я м╕стить"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Адресати"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "╤м'я м╕стить"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "╤м'я м╕стить"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+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
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 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
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 #, 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
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 #, 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%d/%m/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5904,14 +7315,14 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:303
+#: e-util/e-time-utils.c:313
 #, 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:312
+#: e-util/e-time-utils.c:322
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%I:%M %p"
@@ -6006,7 +7417,7 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "зараз"
 
@@ -6018,11 +7429,16 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%I:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<клацн╕ть тут для вибору дати>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Правила ф╕льтрування"
 
@@ -6041,20 +7457,20 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Виб╕р теки"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Введ╕ть URI теки"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<клацн╕ть тут для вибору теки>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6075,62 +7491,51 @@ msgstr "Назва правила: "
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Якщо"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "якщо вс╕ в╕дпов╕до╓ вс╕м критер╕ям"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "якщо в╕дпов╕да╓ будь-якому критер╕ю"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Додати критер╕й"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Редагування в╕льтр╕в"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Виправлення в╕ртуальних тек"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "В╕ртуальн╕ теки"
 
@@ -6157,203 +7562,204 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Створити нову теку"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Прив'язано"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "долучення"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "м╕стить"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Скоп╕ювати у теку"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Дата отримання"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Дата в╕дсилання"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Стерто"
 
-#: 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
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "не ╕сну╓"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Чорновик"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "зак╕нчу╓ться на"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "Вийти"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "╕сну╓"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Вираз"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Важливо"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "б╕льше"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "менше"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 #, fuzzy
 msgid "Mailing list"
 msgstr "Список розсилки %s"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Т╕ло пов╕домлення"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "Заголовок пов╕домлення"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "Пов╕домлення було отримано"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "Пов╕домлення було в╕д╕слано"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Перенести в теку"
 
-#: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "on or after"
-msgstr "К╕нцева дата"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Прочитано"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Адресати"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Replied to"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 #, fuzzy
 msgid "Score"
 msgstr "Моб╕льний"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "В╕дправник"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 #, fuzzy
 msgid "Set Status"
 msgstr "Стан:"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Розм╕р"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "схоже на"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Source Account"
 msgstr "Електронна адреса м╕стить"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "почина╓ться на"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Тема"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "м╕стить"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "не м╕стить"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "не зак╕нчу╓тьтся на"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "не ╕сну╓"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "не схоже на"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "не почина╓ться з"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "зак╕нчу╓ться на"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "╕сну╓"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "б╕льше"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "менше"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "on or after"
+msgstr "К╕нцева дата"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "схоже на"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "почина╓ться на"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "було перед"
@@ -6387,14 +7793,13 @@ 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
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 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
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "Е-пошта"
@@ -6421,12 +7826,12 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "Установки..."
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6487,175 +7892,195 @@ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 msgid "Mail configuration interface"
 msgstr "Конф╕╜урац╕я пошти"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Ф╕льтр списку розсилки"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "Властивост╕..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "В╕д╕слати пов╕домлення"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "В╕д╕слати пов╕домлення"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Властивост╕"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Властивост╕"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: mail/folder-browser.c:893
+#: mail/folder-browser.c:909
 #, fuzzy
-msgid "Store search as vFolder"
-msgstr "Виб╕р теки"
+msgid "Create vFolder from Search"
+msgstr "Створити правило з пов╕домлення"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "В╕ртуальна тека теми"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "В╕ртуальна тека в╕дправника"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "В╕ртуальна тека отримувач╕в"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Ф╕льтр теми"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Ф╕льтр в╕дправника"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Ф╕льтр отримувач╕в"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr ""
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "Зберегти пов╕домлення як..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "В╕дпов╕сти в╕дправнику"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 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
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Позначити непрочитаним"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Важливо"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Позначити непрочитаним"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "Скоп╕ювати в теку..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "В╕дновити"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Додати адресну книгу"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Застосувати ф╕льтри"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Створити правило з пов╕домлення"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Ф╕льтр списку розсилки (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Ф╕льтр списку розсилки (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Нема╓ ╕нформац╕╖"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6719,59 +8144,64 @@ msgid "Evolution News Editor"
 msgstr "╤нсталяц╕я Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "╤нсталяц╕я Evolution"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Файл п╕дпису:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 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
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 #, fuzzy
 msgid " (default)"
 msgstr "Стерти"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "Ви впевнен╕, що хочете стерти завдання"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "В╕дновити"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 #, fuzzy
 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-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "Установки пошти..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6818,17 +8248,17 @@ msgid ""
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6836,203 +8266,231 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 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:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Переслане пов╕домлення:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Пов╕домлення було отримано"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Зберегти пов╕домлення як..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Зберегти пов╕домлення як..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Попередження"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Б╕льше не показувати це пов╕домлення."
+
+#: mail/mail-callbacks.c:1826
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "Ф╕льтри..."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Надрукувати пов╕домлення"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Не вдалося надрукувати пов╕домлення"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ви впевнен╕, що хочете стерти зустр╕ч"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 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."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
 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."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 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."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "╤нсталяц╕я Evolution"
+
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "З'╓днання з сервером..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " Check for supported types "
-msgstr "Визначити типи, що п╕дтримуються..."
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " кол╕р"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "Account"
 msgstr "Електронна адреса м╕стить"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account Information"
 msgstr "Нема╓ ╕нформац╕╖"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Accounts"
 msgstr "Електронна адреса м╕стить"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "долучення"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Автенф╕кац╕я"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Тип автенф╕кац╕╖: "
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "П╕дготувати"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7042,309 +8500,383 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "De_fault"
 msgstr "Стерти"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Display"
+msgstr "День"
+
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Done"
 msgstr "Нема╓"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Чорновики"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Створення ново╖ теки"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:30
+msgid "E_nable"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Зберегти поточний файл з ╕ншою назвою"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: 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:37
-msgid "Empty trash folders on exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Повне ╕м'я:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "Файл п╕дпису:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr ""
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "Покажчик"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Конф╕╜урац╕я пошти"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Формат"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
+#: mail/mail-config.glade.h:44
+msgid "Make this my _default account"
 msgstr ""
 
-#: 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"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "News"
 msgstr "Новий"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Optional Information"
 msgstr "Нема╓ ╕нформац╕╖"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Ор╕╓нтац╕я:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-#, fuzzy
-msgid "PGP binary path:"
-msgstr "Шифрування PGP"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Виб╕р кольору"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 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:57
+#, fuzzy
+msgid "Prompt when sending messages with an _empty subject"
+msgstr "Неможливо в╕д╕слати пов╕домлення: не визначено отримувач╕в"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Неможливо в╕д╕слати пов╕домлення: не визначено отримувач╕в"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "Прим╕тки"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "Нема╓ ╕нформац╕╖"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "Безпека"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Вибрати файл"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
-#, fuzzy
-msgid "Send mail in HTML format by default."
-msgstr "В╕д╕слати пошту в формат╕ HTML"
-
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "В╕д╕слано"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "В╕д╕слати пов╕домлення негайно"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "В╕д╕слати пов╕домлення п╕зн╕ше"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Конф╕╜урац╕я пошти"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Type: "
 msgstr "Сервер:"
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
-msgstr ""
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
+msgstr "Автенф╕кац╕я"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Файл п╕дпису:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Джерела"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Нема╓ ╕нформац╕╖"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Джерела"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "В╕ртуальн╕ теки"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
+#: mail/mail-config.glade.h:86
+msgid "Use secure connection (_SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:87
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+msgid "_Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr "Визначити типи, що п╕дтримуються..."
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "Електронна адреса:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Повне ╕м'я:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "Файл п╕дпису:"
+
+#: mail/mail-config.glade.h:100
+msgid "_Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "Комп'ютер:"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
 #: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+msgid "_Log filter actions to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Назва користувача:"
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
 #: mail/mail-config.glade.h:105
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
+#, fuzzy
+msgid "_Name:"
+msgstr "╤м'я:"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Ор╕╓нтац╕я:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "Шифрування PGP"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Шлях:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Запам'ятати цей пароль"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "В╕д╕слати пошту в формат╕ HTML"
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Файл п╕дпису:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Назва користувача:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "seconds."
 msgstr "В╕д╕слати"
@@ -7393,207 +8925,218 @@ msgstr "Не вдалось створити в╕кно конструктора."
 msgid "Could not create a S/MIME decode context."
 msgstr "Не вдалось створити в╕кно конструктора."
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Зберегти долучення"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Зберегти на диск..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "В╕дкрити в %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Прибрати"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 #, fuzzy
 msgid "Loading message content"
 msgstr "Пересилання пов╕домлень \"%s\""
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "В╕дкрити у новому в╕кн╕"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Контакт"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Завдання"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Зберегти як..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Стерто"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "В╕д╕слати"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "долучення"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 #, fuzzy
 msgid "Date"
 msgstr "п╕сля"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "Електронна адреса:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "В╕д"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "В╕дпов╕дати на:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "До"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Програма GPG/PGP не доспуна."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Зашифроване пов╕домлення"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:330
 #, fuzzy, c-format
-msgid "Opening '%s'"
+msgid "No such folder /%s"
+msgstr "Нев╕рна тека \"%s\"."
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "В╕дкрити в %s..."
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, 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
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 "Неможливо отримати пов╕домлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "Конф╕╜урувати теку"
@@ -7614,215 +9157,236 @@ msgid ""
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Запам'ятати цей пароль"
+
+#: mail/mail-mt.c:796
 #, fuzzy
 msgid "Working"
 msgstr "Перенесення"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Конф╕╜урувати теку"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Sendmail"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "В╕дсилання \"%s\""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Запис пов╕домлення %d з %d"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 #, fuzzy
 msgid "Complete."
 msgstr "% завершення:"
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Збереження пов╕домлень з теки \"%s\""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Коп╕ювання пов╕домлень"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Перенесення"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Коп╕ювання"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 #, fuzzy
 msgid "Trash"
 msgstr "Завдання"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "В╕дкривання теки %s"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "В╕дкривання теки %s"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "В╕дкривання теки %s"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Синхрон╕зац╕я \"%s\""
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Конф╕╜урувати теку"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання пов╕домлення %s"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Отримання пов╕домлення"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Збереження пов╕домлень"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дан╕: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "Пошук"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Ненайменований)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Надрукувати пов╕домлення"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "Виправити пов╕домлення"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "Виправити пов╕домлення"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "Переслати"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "Знайти"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "Шлях:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling..."
 msgstr "В╕дм╕нити"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Отримання"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "Оновлення..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "Оч╕кування..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "В╕дсилання"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "В╕дм╕нено."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr ""
 
@@ -7841,92 +9405,97 @@ msgstr "Переслане пов╕домлення %s"
 msgid "Forwarded message"
 msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "В╕ртуальн╕ теки"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Нова в╕ртуальна тека"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Fwd: (без теми)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "Пов╕домлення"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Не вдалося в╕д╕слати пов╕домлення: %s"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Надрукувати пов╕домлення"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 #, fuzzy
 msgid "Lowest"
 msgstr "Низький"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 #, fuzzy
 msgid "Lower"
 msgstr "Низький"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 #, fuzzy
 msgid "Higher"
 msgstr "Високий"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 #, fuzzy
 msgid "Highest"
 msgstr "Високий"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:913
-#, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%I:%M %p"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "Збереження пов╕домлень"
 
 #: mail/message-list.etspec.h:2
@@ -7942,39 +9511,77 @@ msgstr "Дата отримання"
 msgid "Size"
 msgstr "Розм╕р"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Тека"
-
-#: mail/subscribe-dialog.c:77
-#, fuzzy
-msgid "Store"
-msgstr "Моб╕льний"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr ""
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Сканування тек в \"%s\""
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr ""
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Сканування тек в \"%s\""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Передплатити теку \"%s\""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "В╕дм╕нити передплату на теку \"%s\""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Тека"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "Пов╕домлення було отримано"
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Оновити список"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Теки"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Параметри в╕дображення"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "Керування передплатами"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Передплатити"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Припинити передплату"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -7984,55 +9591,72 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 #, 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
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Зустр╕ч╕"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Показати зустр╕ч╕"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%I:%M %p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Нед╕ля"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "╤м'я:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "╤нсталяц╕я Evolution"
+msgid "Summary Settings"
+msgstr "Зведення м╕стить"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8043,7 +9667,12 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Помилка завантаження календаря</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Нова тека"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Показати завдання"
@@ -8052,28 +9681,33 @@ msgstr "Показати завдання"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "╤нша"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Розд╕ли:"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %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"
+msgid "Print Summary"
+msgstr "Зведення"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "Не вдалося надрукувати пов╕домлення"
 
 #: my-evolution/main.c:52
@@ -8081,6 +9715,42 @@ msgstr "Не вдалося надрукувати пов╕домлення"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "╟F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "╟C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Шрифти"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Перенесення"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Ф╕льтри..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "Ф╕льтри..."
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9267,122 +10937,138 @@ 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 "Теки"
+msgid " _Remove"
+msgstr "Видалити"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
+#: my-evolution/my-evolution.glade.h:2
+msgid "Add n_ew feed"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:4
+#: my-evolution/my-evolution.glade.h:3
 #, fuzzy
-msgid "All stations:"
+msgid "Al_l stations:"
 msgstr "Весь супров╕д"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "Display folders:"
-msgstr "Створення ново╖ теки"
+msgid "All _folders:"
+msgstr "Теки"
+
+#: my-evolution/my-evolution.glade.h:5
+msgid "All news _feeds:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Параметри в╕дображення"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "День"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "П'ятниця"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "м╕сяць"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "Показати 1 тиждень"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Показати завдання"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "Показати завдання"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "Середа"
+msgid "Tasks "
+msgstr "Завдання"
 
 #: my-evolution/my-evolution.glade.h:16
-#, fuzzy
-msgid "One month"
-msgstr "м╕сяць"
+msgid "Units: "
+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 ""
+msgid "Weather settings"
+msgstr "Очистити вибране"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr "Планування зустр╕ч╕"
+msgid "_Display folders:"
+msgstr "Створення ново╖ теки"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Показати завдання"
+msgid "_Display stations:"
+msgstr "Параметри в╕дображення"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
-msgstr ""
+#, fuzzy
+msgid "_Displayed feeds:"
+msgstr "День"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Показати завдання"
+msgid "_Five days"
+msgstr "П'ятниця"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "Завдання"
+msgid "_Mail"
+msgstr "Е-пошта"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
-msgstr ""
+#, fuzzy
+msgid "_News Feeds"
+msgstr "Нова тека"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "╤нша"
+msgid "_One day"
+msgstr "Середа"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "Очистити вибране"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "imperial"
-msgstr ""
+#, fuzzy
+msgid "_Schedule"
+msgstr "Планування зустр╕ч╕"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "Повн╕ заголовки"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "╤нша"
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "_imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9400,7 +11086,17 @@ msgstr "Подробиц╕"
 msgid "Cancel Operation"
 msgstr "Скасувати зустр╕ч"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "В╕ртуальн╕ теки"
@@ -9450,7 +11146,7 @@ msgid ""
 "`%s'."
 msgstr "Сталася помилка п╕д час зчитування файлу."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9458,7 +11154,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9467,7 +11163,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9475,57 +11171,81 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "Неможливо скоп╕ювати файли в\n"
 "\"%s\"."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Скоп╕ювати у теку"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Перенести в теку"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Не вдалось стерти теку \"%s\":\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Стерти завдання"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "В╕дкривання теки %s"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Назва правила: "
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Назва файлу:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9539,7 +11259,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "Вказана назва теки не в╕рна."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Створення ново╖ теки"
 
@@ -9549,11 +11269,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Новий..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Ненайменований)"
 
@@ -9583,7 +11303,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9627,7 +11347,7 @@ msgstr "Автовиб╕р"
 msgid "Filename:"
 msgstr "Назва файлу:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Вибрати файл"
 
@@ -9635,304 +11355,326 @@ msgstr "Вибрати файл"
 msgid "File type:"
 msgstr "Тип файлу:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "Виб╕р теки"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy не знайдено за шляхом вказаним в $PATH."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 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:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Перейти на теку..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Створити новий контакт"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "Перенесення"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Work Offline"
 msgstr "Перенесення"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1311
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "Гаразд"
+
+#: shell/e-shell.c:1644
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:1646
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Загальна помилка"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Назва групи:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Не видаляти"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "Мал╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Показувати ярлик╕ як мал╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "Велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "Нова група..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Видалити цю групу..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Видалити цю групу..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, 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
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "В╕дкрити у новому в╕кн╕"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, 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
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Без назви)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Без помилок"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Загальна помилка"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Тека з ц╕╓ю назвою вже ╕сну╓"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "Вказаний тип теки не в╕рний"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Помилка вводу/виводу"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Не вистача╓ м╕сця для створення теки"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Вказано╖ теки не знайдено"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Операц╕я не п╕дтриму╓ться"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Вказано╖ теки не знайдено"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% завершення:"
 
@@ -9954,11 +11696,6 @@ msgstr "Комп'ютер:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#, fuzzy
-msgid "Folder name:"
-msgstr "Назва файлу:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder type:"
@@ -9975,18 +11712,27 @@ msgstr ""
 
 #: shell/importer/import.glade.h:2
 #, fuzzy
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr "╤нсталяц╕я Evolution"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Utility"
+msgid "Evolution Importer Assistant"
 msgstr "╤нсталяц╕я Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+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"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -10006,10 +11752,10 @@ msgid "Don't ask me again"
 msgstr "Б╕льше не показувати це пов╕домлення."
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10026,31 +11772,36 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати компонентну систему Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Скоп╕ювати"
 
@@ -10067,11 +11818,11 @@ msgstr "Створити новий контакт"
 msgid "Create new contact list"
 msgstr "Створити новий контакт"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Вир╕зати"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Вир╕зати вибране"
 
@@ -10080,79 +11831,122 @@ msgstr "Вир╕зати вибране"
 msgid "Delete selected contacts"
 msgstr "Стерти контакт"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Новий контакт"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Новий"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Вставити"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Вставити буфер обм╕ну"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Переглянути календар, що буде надрукувано"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Надрукувати контакти"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "Стерти контакт"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Вибрати все"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Стерти контакт"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "В╕д╕слати пов╕домлення за контактом..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "Стерти контакт"
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "В╕д╕слати пов╕домлення за контактом"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "В╕д╕слати контакт ╕ншому"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Зупинити"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Зупинити завантаження"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "Д╕╖"
+
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Додати джерело"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "Контакт"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "Контакти..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Друкувати..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Зберегти як VCard"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "Пошук контакт╕в"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 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
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "╤нструменти"
 
@@ -10162,116 +11956,134 @@ 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"
-msgstr "Створити нову зустр╕ч"
+msgid "Create a New _Task"
+msgstr "Створити нову завдання"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Створити нову зустр╕ч"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "День"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Стерти цю зустр╕ч"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "Перейти"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Перейти назад в час╕"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Перейти вперед в час╕"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to _Date"
 msgstr "К╕нцева дата"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Перейти до вказано╖ дати"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Поперейти в точний час"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "сьогодн╕"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "М╕сяць"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Нова зустр╕ч"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Нове завдання"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Переглянути календар, що буде надрукувано"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Надрукувати календар"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Надрукувати цей календар"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Перегляд друку"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "Нема╓ ╕нформац╕╖"
+msgid "Print this calendar"
+msgstr "Надрукувати цей календар"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Показати 1 день"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Показати 1 м╕сяць"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Показати 1 тиждень"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Показати робочий тиждень"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
-msgid "W_ork Week"
-msgstr "Робочий тиждень"
+msgid "Week"
+msgstr "Тиждень"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "Зустр╕ч╕"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "Установки пошти..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "День"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "М╕сяць"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Нема╓ ╕нформац╕╖"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
-msgid "_Week"
-msgstr "Тиждень"
+msgid "_Task..."
+msgstr "Завдання"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10282,15 +12094,16 @@ msgid "Close"
 msgstr "Закрити"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Закрити цю зустр╕ч"
+#, fuzzy
+msgid "Close this item"
+msgstr "Стерти цей елемент"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Стерти цю зустр╕ч"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Стерти цей елемент"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Головна панель ╕нструмент╕в"
 
@@ -10299,118 +12112,84 @@ msgstr "Головна панель ╕нструмент╕в"
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Друкувати..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Зберегти"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Зберегти та закрити"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
+msgid "Save the item and close the dialog box"
 msgstr "Зберегти контакт ╕ закрити д╕алог"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 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 "Стерти..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Дов╕дка"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Надрукувати конверт..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Зберегти як..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Зберегти контакт ╕ закрити д╕алог"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "В╕д╕слати контакт ╕ншому..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:13
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "В╕д╕слати пов╕домлення за контактом..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "Зберегти"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Стерти цей елемент"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Стерти..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Зберегти контакт ╕ закрити д╕алог"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "В╕д╕слати контакт ╕ншому..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "В╕д╕слати пов╕домлення за контактом..."
@@ -10420,22 +12199,22 @@ msgstr "В╕д╕слати пов╕домлення за контактом..."
 msgid "Cancel Mee_ting"
 msgstr "Скасувати зустр╕ч"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 #, fuzzy
 msgid "Cancel the meeting for this item"
 msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Завантаження календаря"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Переслати це пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10448,16 +12227,11 @@ msgstr "Планування зустр╕ч╕"
 msgid "Schedule _Meeting"
 msgstr "Планувати зустр╕ч"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 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 "Д╕╖"
-
 #: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10474,69 +12248,66 @@ msgid "Cancel the current mail operation"
 msgstr "Зберегти поточний файл"
 
 #: 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
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Спорожнити см╕тник"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Забути парол╕"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "Керування передплатами..."
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Наступне пов╕домлення"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Дата отримання"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Редактор в╕ртуальних тек"
@@ -10563,97 +12334,108 @@ msgstr "Перегляд"
 msgid "_Send / Receive"
 msgstr "Дата отримання"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "Передплатити теку \"%s\""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Вир╕зати"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Прибрати вибран╕ пов╕домлення"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Прибрати стерт╕ пов╕домлення"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Прибрати прочитан╕ пов╕домлення"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Позначити вс╕ прочитаними"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Вставити буфер обм╕ну"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Вибрати все"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Вибрати г╕лку"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "Показати все"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "Прибрати прочитан╕ пов╕домлення"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Переслати це пов╕домлення"
@@ -10662,7 +12444,7 @@ msgstr "Переслати це пов╕домлення"
 msgid "_Expunge"
 msgstr "Викреслити"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "Тека"
 
@@ -10670,11 +12452,11 @@ msgstr "Тека"
 msgid "_Invert Selection"
 msgstr "╤нвертувати виб╕р"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "Властивост╕..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Переслати це пов╕домлення"
@@ -10926,7 +12708,8 @@ 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"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Переглянути пов╕домлення, що буде надрукувано"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10948,43 +12731,37 @@ msgstr "Попередн╓ пов╕домлення"
 msgid "Previous Unread Message"
 msgstr "Попередн╓ пов╕домлення"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Надрукувати пов╕домлення..."
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "Перегляд друку"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Надрукувати пов╕домлення"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "В╕дпов╕сти"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "Серверне пов╕домлення:"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Зберегти пов╕домлення у новому файл╕"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -11037,75 +12814,58 @@ msgstr "В╕ртуальна тека отримувач╕в"
 msgid "VFolder on _Subject..."
 msgstr "В╕ртуальна тека теми"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "Застосувати ф╕льтри"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Скоп╕ювати у теку"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Створити правило з пов╕домлення"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Переслан╕ пов╕домлення"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Пов╕домлення"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Перенести в теку"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "День"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "В╕д╕слати пов╕домлення знову"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "В╕д╕слати пов╕домлення знову"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Закрити це в╕кно"
 
-#: 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-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "Закрити"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "Вид"
 
@@ -11172,11 +12932,6 @@ msgstr "Шифрування PGP"
 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 "Зберегти як"
@@ -11312,7 +13067,7 @@ msgstr "В╕дпов╕дати на:"
 msgid "_Security"
 msgstr "Безпека"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "Дов╕дка"
 
@@ -11346,15 +13101,28 @@ msgstr "Припинити передплату"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "Прив'язати завдання"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "Нове завдання"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Стерти завдання"
+msgid "Cancel this task"
+msgstr "Нове завдання"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "Оновити список"
@@ -11363,44 +13131,32 @@ msgstr "Оновити список"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "В╕дкрити завдання"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Створити нову завдання"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Стерти завдання"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "Стерти завдання"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr "Нове завдання"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "Установки пошти..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "Завдання"
 
@@ -11437,186 +13193,167 @@ msgstr ""
 msgid "Create a new folder"
 msgstr "Створення ново╖ теки"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Стерти цей елемент"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "В╕добразити ╕ншу теку"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "Вийти"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "В╕кно Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Вийти з програми"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "Розпочато"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "В╕дкрити у новому в╕кн╕"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "В╕дкрити поточне пов╕домлення у новому в╕кн╕"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Показати ╕нформац╕ю про Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "П╕дготувати зв╕т про помилку"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "В╕д╕слати зв╕т про помилку"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "В╕д╕слати зв╕т про помилку використовуючи Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Toggle"
 msgstr "Моб╕льний"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 #, 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:35
-msgid "Using the _Calendar"
-msgstr "Використання календаря"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "Використання поштово╖ програми"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Показати вибрану теки"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "Про Evolution..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "Зустр╕ч"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "Контакт"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "Скоп╕ювати"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "Панель тек"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "Перейти на теку..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "╤мпортувати файл..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "Покажчик"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "Поштову пов╕домлення"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "Перенести"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "Новий"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "Нова тека"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "В╕дкрити..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Панель ярлик╕в"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Панель ярлик╕в"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "Завдання"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Перенесення"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr "Нед╕ля"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Прочитано"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
 msgstr "Установки пошти..."
 
 #: views/addressbook/galview.xml.h:1
@@ -11655,6 +13392,30 @@ msgstr ""
 "\n"
 "Категор╕╖: "
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Вибрати файл"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Розд╕ли:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Часовий пояс: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11662,10 +13423,6 @@ msgstr ""
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Зайнятий"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "За межами оф╕су"
@@ -11739,7 +13496,7 @@ msgstr "Весь супров╕д"
 msgid "_Current View"
 msgstr "Поточний р╕к (%Y)"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11749,19 +13506,20 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr "ПВСЧПСН"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "зараз"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "сьогодн╕"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "Гаразд"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -11851,36 +13609,34 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "Редактор контакт╕в"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 #, fuzzy
 msgid "Save Search"
 msgstr "Пошук"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "Удосконалений пошук"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Пошук"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+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
 #, fuzzy
 msgid "Error"
@@ -11899,10 +13655,15 @@ msgstr "Пов╕домлення"
 msgid "Don't show this message again."
 msgstr "Б╕льше не показувати це пов╕домлення."
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Пошук"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "Знайти"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Персональний сервер адресно╖ книги"
@@ -11924,6 +13685,225 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
 #, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Нед╕ля"
+
+#~ msgid "LDAP Server"
+#~ msgstr "Сервер LDAP"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Нев╕домий тип адресно╖ книги"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Нев╕домий тип авторизац╕╖"
+
+#, fuzzy
+#~ msgid "Subtree"
+#~ msgstr "Джерело"
+
+#~ msgid "Authentication:"
+#~ msgstr "Аутенф╕кац╕я:"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Створити шлях, якщо його не ╕сну╓."
+
+#~ msgid "Name"
+#~ msgstr "╤м'я:"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Введ╕ть пароль для %s"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "╤м'я м╕стить"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "Вибер╕ть назву з списку:"
+
+#~ msgid "USA"
+#~ msgstr "США"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "В╕дм╕нено"
+
+#~ msgid "Transparent"
+#~ msgstr "Прозорий"
+
+#~ msgid "Opaque"
+#~ msgstr "Непрозорий"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Параметри календаря"
+
+#, fuzzy
+#~ msgid "Defaults"
+#~ msgstr "Подробиц╕"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Нагадувати про вс╕ зустр╕ч╕"
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Стерто"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Нема╓"
+
+#~ msgid "Task"
+#~ msgstr "Завдання"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% завершення:"
+
+#~ msgid "Transparency"
+#~ msgstr "Прозор╕сть"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Пов╕домлення %s не знайдено."
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Схоже тека непоправно з╕псована."
+
+#~ msgid "Edit"
+#~ msgstr "Виправити"
+
+#, fuzzy
+#~ msgid "Store search as vFolder"
+#~ msgstr "Виб╕р теки"
+
+#~ msgid "Receiving"
+#~ msgstr "Отримання"
+
+#, fuzzy
+#~ msgid "Store"
+#~ msgstr "Моб╕льний"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "╤нсталяц╕я Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %d %B %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Не вдалося надрукувати пов╕домлення"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Новий контакт"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "Контакт"
+
+#~ msgid "Go to present time"
+#~ msgstr "Поперейти в точний час"
+
+#, fuzzy
+#~ msgid "W_ork Week"
+#~ msgstr "Робочий тиждень"
+
+#~ msgid "_Day"
+#~ msgstr "День"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Закрити цю зустр╕ч"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "Параметри друку"
+
+#, fuzzy
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Зберегти контакт ╕ закрити д╕алог"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "Д╕╖"
+
+#~ msgid "Help"
+#~ msgstr "Дов╕дка"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "В╕д╕слати контакт ╕ншому..."
+
+#~ msgid "Compose"
+#~ msgstr "П╕дготувати"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Керування передплатами..."
+
+#~ msgid "Show _All"
+#~ msgstr "Показати все"
+
+#, fuzzy
+#~ msgid "Print Message..."
+#~ msgstr "Надрукувати пов╕домлення..."
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "Перегляд друку"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "В╕д╕слати пов╕домлення знову"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Стерти завдання"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Зберегти завдання як щось ╕нше"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Розпочато"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Використання менеджера контакт╕в"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Використання календаря"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Використання поштово╖ програми"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "Зустр╕ч"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "Контакт"
+
+#~ msgid "_Index"
+#~ msgstr "Покажчик"
+
+#~ msgid "_Mail message"
+#~ msgstr "Поштову пов╕домлення"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "Завдання"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Установки пошти..."
+
+#, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Параметри календаря"
 
@@ -11958,15 +13938,9 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ 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 "В╕зуальн╕ си╜нали"
 
@@ -11989,10 +13963,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgstr "Виправити завдання"
 
 #, fuzzy
-#~ msgid "Go to Today"
-#~ msgstr "сьогодн╕"
-
-#, fuzzy
 #~ msgid "Component successfully updated."
 #~ msgstr "Файли Evolution усп╕шно встановлено."
 
@@ -12048,12 +14018,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgid "label55"
 #~ msgstr "label26"
 
-#~ msgid "Summary contains"
-#~ msgstr "Зведення м╕стить"
-
-#~ msgid "Comment contains"
-#~ msgstr "Коментар м╕стить"
-
 #, fuzzy
 #~ msgid "Has category"
 #~ msgstr ""
@@ -12131,10 +14095,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgstr "Перейти до наступного елементу"
 
 #, fuzzy
-#~ msgid "RDF Summary"
-#~ msgstr "Нед╕ля"
-
-#, fuzzy
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
@@ -12168,9 +14128,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (переслане пов╕домлення)"
 
-#~ msgid "Fwd: (no subject)"
-#~ msgstr "Fwd: (без теми)"
-
 #~ msgid "Forwarded message (no subject)"
 #~ msgstr "Переслане пов╕домлення (без теми)"
 
@@ -12204,9 +14161,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "Створити новий календар"
 
-#~ msgid "Day"
-#~ msgstr "День"
-
 #~ msgid "New _Event"
 #~ msgstr "Нова под╕я"
 
@@ -12234,9 +14188,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "Адресна книга..."
 
-#~ msgid "C_lear"
-#~ msgstr "Очистити"
-
 #, fuzzy
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "Завдання"
@@ -12276,10 +14227,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgid "Select everything"
 #~ msgstr "Вибрати назви"
 
-#, fuzzy
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "Завдання"
-
 #~ msgid "_About..."
 #~ msgstr "Про..."
 
@@ -12313,9 +14260,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgid "Create a new email"
 #~ msgstr "Створити новий контакт"
 
-#~ msgid "New Mail"
-#~ msgstr "Нова пошта"
-
 #~ msgid "Configure Folder..."
 #~ msgstr "Налаштувати теку..."
 
@@ -12339,9 +14283,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr "Переслати пов╕домлення без теми"
 
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "Прибрати стерт╕ пов╕домлення"
-
 #~ msgid "Invert Selection"
 #~ msgstr "╤нвертувати виб╕р"
 
@@ -12381,9 +14322,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgid "_Reply"
 #~ msgstr "В╕дпов╕сти"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "Зберегти пов╕домлення як..."
-
 #~ msgid "Save in _folder... (FIXME)"
 #~ msgstr "Зберегти в тец╕..."
 
@@ -12393,10 +14331,6 @@ msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "Вставити текстовий файл..."
 
-#, fuzzy
-#~ msgid "Assig_n Task (FIXME)"
-#~ msgstr "Прив'язати завдання"
-
 #~ msgid "Redo"
 #~ msgstr "Повторити"